diff options
author | Frédéric Buclin <LpSolit@gmail.com> | 2014-09-11 01:53:07 +0200 |
---|---|---|
committer | Frédéric Buclin <LpSolit@gmail.com> | 2014-09-11 01:53:07 +0200 |
commit | e1603d01bbc3523b622db2f295400aa5a5f14509 (patch) | |
tree | 53cfc18ee24e626912401bea9ab4be346e1e05ce /Bugzilla.pm | |
parent | Bug 1041306: Kill global/site-navigation.html.tmpl to conform to the HTML5 sp... (diff) | |
download | bugzilla-e1603d01bbc3523b622db2f295400aa5a5f14509.tar.gz bugzilla-e1603d01bbc3523b622db2f295400aa5a5f14509.tar.bz2 bugzilla-e1603d01bbc3523b622db2f295400aa5a5f14509.zip |
Bug 1052724: Use JSON::XS instead of Data::Dumper to store parameters into data/params
r=dkl r=wurblzap a=sgreen
Diffstat (limited to 'Bugzilla.pm')
-rw-r--r-- | Bugzilla.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Bugzilla.pm b/Bugzilla.pm index e1f2fde3b..7d935db48 100644 --- a/Bugzilla.pm +++ b/Bugzilla.pm @@ -122,8 +122,8 @@ sub init_page { # # This code must go here. It cannot go anywhere in Bugzilla::CGI, because # it uses Template, and that causes various dependency loops. - if (Bugzilla->params->{"shutdownhtml"} - && !grep { $_ eq $script } SHUTDOWNHTML_EXEMPT) + if (!grep { $_ eq $script } SHUTDOWNHTML_EXEMPT + and Bugzilla->params->{'shutdownhtml'}) { # Allow non-cgi scripts to exit silently (without displaying any # message), if desired. At this point, no DBI call has been made @@ -939,9 +939,9 @@ Change the database object to refer to the main database. =item C<params> -The current Parameters of Bugzilla, as a hashref. If C<data/params> -does not exist, then we return an empty hashref. If C<data/params> -is unreadable or is not valid perl, we C<die>. +The current Parameters of Bugzilla, as a hashref. If C<data/params.js> +does not exist, then we return an empty hashref. If C<data/params.js> +is unreadable or is not valid, we C<die>. =item C<local_timezone> |