diff options
author | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
commit | ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5 (patch) | |
tree | 483da9c8b66f4444bb8a410e3d599c7484ad721e /Bugzilla.pm | |
parent | daa2d6b1c40354ecce0e48e6c5ee686efe642c4b (diff) | |
parent | 2f8b999750cc700faf03c6aee1c53d1fc4df767f (diff) | |
download | bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.gz bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.xz |
Merge branch 'master' into unstable
Diffstat (limited to 'Bugzilla.pm')
-rw-r--r-- | Bugzilla.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Bugzilla.pm b/Bugzilla.pm index afdfcefd2..e43110389 100644 --- a/Bugzilla.pm +++ b/Bugzilla.pm @@ -22,7 +22,7 @@ BEGIN { } } -our $VERSION = '20180306.4'; +our $VERSION = '20180330.1'; use Bugzilla::Auth; use Bugzilla::Auth::Persist::Cookie; @@ -625,7 +625,7 @@ sub switch_to_shadow_db { my $class = shift; if (!$class->request_cache->{dbh_shadow}) { - if ($class->params->{'shadowdb'}) { + if ($class->get_param_with_override('shadowdb')) { $class->request_cache->{dbh_shadow} = Bugzilla::DB::connect_shadow(); } else { $class->request_cache->{dbh_shadow} = $class->dbh_main; |