From b8ec302b3a99b54f5838e497adb1cabe3f2f15dd Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Sun, 21 Sep 2008 23:40:40 +0000
Subject: =?UTF-8?q?Bug=20398075:=20Bugzilla=20should=20be=20able=20to=20di?=
 =?UTF-8?q?splay=20the=20"shutdownhtml"=20message=20even=20if=20the=20SQL?=
 =?UTF-8?q?=20server=20is=20down=20-=20Patch=20by=20Fr=C3=83=C2=A9d=C3=83?=
 =?UTF-8?q?=C2=A9ric=20Buclin=20<LpSolit@gmail.com>=20r/a=3Dmkanat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Bugzilla.pm')

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();
 
-- 
cgit v1.2.1