Bug 950486: Move the webdotbase and font_file parameters from data/params into localconfig (and kill the Graphs panel). r=gerv, a=glob.

1 files changed, 11 insertions, 0 deletions

diff --git a/Bugzilla/Install/Localconfig.pm b/Bugzilla/Install/Localconfig.pm
index 7f473cc77..4ccd107ae 100644
--- a/Bugzilla/Install/Localconfig.pm
+++ b/Bugzilla/Install/Localconfig.pm
@@ -109,6 +109,14 @@ use constant LOCALCONFIG_VARS => (
         default => sub { dirname(bin_loc('diff')) },
     },
     {
+        name    => 'font_file',
+        default => '',
+    },
+    {
+        name    => 'webdotbase',
+        default => '',
+    },
+    {
         name    => 'site_wide_secret',
         # 64 characters is roughly the equivalent of a 384-bit key, which
         # is larger than anybody would ever be able to brute-force.
@@ -225,6 +233,9 @@ sub update_localconfig {
             if (exists $answer->{$name}) {
                 $localconfig->{$name} = $answer->{$name};
             }
+            elsif (exists Bugzilla->params->{$name}) {
+                $localconfig->{$name} = Bugzilla->params->{$name};
+            }
             else {
                 # If the user did not supply an answers file, then they get
                 # notified about every variable that gets added. If there was