diff options
author | Dylan William Hardison <dylan@hardison.net> | 2015-10-31 02:03:58 +0100 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2015-10-31 02:06:57 +0100 |
commit | 5852295860d51040f69bbaf957cc8ed6bfd7358b (patch) | |
tree | a0781afa608c45912a97c1b2ac3b75e0d8659f2b /Bugzilla/DB.pm | |
parent | f03cb21e297f73fcfca9740ff8e2c525a745d7ad (diff) | |
download | bugzilla-5852295860d51040f69bbaf957cc8ed6bfd7358b.tar.gz bugzilla-5852295860d51040f69bbaf957cc8ed6bfd7358b.tar.xz |
Bug 1218457 - Allow localconfig to override (force) certain data/params values
Diffstat (limited to 'Bugzilla/DB.pm')
-rw-r--r-- | Bugzilla/DB.pm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm index f201124a8..cc2826f55 100644 --- a/Bugzilla/DB.pm +++ b/Bugzilla/DB.pm @@ -118,19 +118,19 @@ sub quote { sub connect_shadow { my $params = Bugzilla->params; - die "Tried to connect to non-existent shadowdb" - unless $params->{'shadowdb'}; + die "Tried to connect to non-existent shadowdb" + unless Bugzilla->get_param_with_override('shadowdb'); # Instead of just passing in a new hashref, we locally modify the # values of "localconfig", because some drivers access it while # connecting. - my %connect_params = %{ Bugzilla->localconfig }; - $connect_params{db_host} = $params->{'shadowdbhost'}; - $connect_params{db_name} = $params->{'shadowdb'}; - $connect_params{db_port} = $params->{'shadowdbport'}; - $connect_params{db_sock} = $params->{'shadowdbsock'}; + my $connect_params = dclone(Bugzilla->localconfig); + $connect_params->{db_host} = Bugzilla->get_param_with_override('shadowdbhost'); + $connect_params->{db_name} = Bugzilla->get_param_with_override('shadowdb'); + $connect_params->{db_port} = Bugzilla->get_param_with_override('shadowport'); + $connect_params->{db_sock} = Bugzilla->get_param_with_override('shadowsock'); - return _connect(\%connect_params); + return _connect($connect_params); } sub connect_main { |