From b8ec302b3a99b54f5838e497adb1cabe3f2f15dd Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" <> Date: Sun, 21 Sep 2008 23:40:40 +0000 Subject: Bug 398075: Bugzilla should be able to display the "shutdownhtml" message even if the SQL server is down - Patch by Frédéric Buclin r/a=mkanat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bugzilla.pm | 8 +++++++- template/en/default/global/common-links.html.tmpl | 2 +- template/en/default/global/field-descs.none.tmpl | 10 ++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Bugzilla.pm b/Bugzilla.pm index ba3e75d89..b8d2e9b84 100644 --- a/Bugzilla.pm +++ b/Bugzilla.pm @@ -139,7 +139,13 @@ sub init_page { # For security reasons, log out users when Bugzilla is down. # Bugzilla->login() is required to catch the logincookie, if any. - my $user = Bugzilla->login(LOGIN_OPTIONAL); + my $user; + eval { $user = Bugzilla->login(LOGIN_OPTIONAL); }; + if ($@) { + # The DB is not accessible. Use the default user object. + $user = Bugzilla->user; + $user->{settings} = {}; + } my $userid = $user->id; Bugzilla->logout(); diff --git a/template/en/default/global/common-links.html.tmpl b/template/en/default/global/common-links.html.tmpl index 4690d177a..18695a8c6 100644 --- a/template/en/default/global/common-links.html.tmpl +++ b/template/en/default/global/common-links.html.tmpl @@ -39,7 +39,7 @@
  • | Reports
  • - [% IF Bugzilla.has_flags %] + [% IF Param('shutdownhtml') || Bugzilla.has_flags %] | [% IF user.id %]