Bug 398075: Bugzilla should be able to display the "shutdownhtml" message even if the SQL server is down - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat

1 files changed, 7 insertions, 1 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();