Bug 519676: Allow users to set blank/false values for things in checksetup.pl's ...

Patch by Max Kanat-Alexander <mkanat@bugzilla.org> (module owner) a=mkanat

diff --git a/Bugzilla/Config.pm b/Bugzilla/Config.pm
index 4074abcd1a4070b967c5851b1f504b90f25a8bff..a20751737196e9f22ea37cb88db86d2cd923abdd 100644 (file)
--- a/Bugzilla/Config.pm
+++ b/Bugzilla/Config.pm
@@ -199,7 +199,12 @@ sub update_params {
         my $name = $item->{'name'};
         unless (exists $param->{$name}) {
             print "New parameter: $name\n" unless $new_install;
-            $param->{$name} = $answer->{$name} || $item->{'default'};
+            if (exists $answer->{$name}) {
+                $param->{$name} = $answer->{$name};
+            }
+            else {
+                $param->{$name} = $item->{'default'};
+            }
         }
     }
 

diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index 971064722677ecb625ac82b2bb45ce29d290d976..34674665590a7f09df78b51d78b3f212f6ecc579 100644 (file)
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -326,7 +326,12 @@ sub update_localconfig {
         if (!defined $localconfig->{$name}) {
             push(@new_vars, $name);
             $var->{default} = &{$var->{default}} if ref($var->{default}) eq 'CODE';
-            $localconfig->{$name} = $answer->{$name} || $var->{default};
+            if (exists $answer->{$name}) {
+                $localconfig->{$name} = $answer->{$name};
+            }
+            else {
+                $localconfig->{$name} = $var->{default};
+            }
         }
     }