diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2017-10-07 00:11:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-07 00:11:25 +0200 |
| commit | bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a (patch) | |
| tree | b2f34eca75df83ecc1f8da1f5d59184bcad242b0 /mod_perl.pl | |
| parent | 6fe0afaa39271bbd75cf068abd67b19fd062a843 (diff) | |
| download | bugzilla-bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a.tar.gz bugzilla-bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a.tar.xz | |
Bug 1404092 - Bugzilla->localconfig should directly use environmental variables and ignore the localconfig file
Diffstat (limited to 'mod_perl.pl')
| -rw-r--r-- | mod_perl.pl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mod_perl.pl b/mod_perl.pl index 42b74fde5..c682bece6 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -76,6 +76,12 @@ my $server = Apache2::ServerUtil->server; my $conf = Bugzilla::ModPerl->apache_config($cgi_path); $server->add_config([ grep { length $_ } split("\n", $conf)]); +# Pre-load localconfig. It might already be loaded, but we need to make sure. +Bugzilla->localconfig; +if ($ENV{LOCALCONFIG_ENV}) { + delete @ENV{ (Bugzilla::Install::Localconfig::ENV_KEYS) }; +} + # Pre-load all extensions Bugzilla::Extension->load_all(); |