Bug 650593: Bugzilla crashes when the database is gone, even when shutdownhtml is set

r=justdave a=LpSolit

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 4de2e815f14069cfd22bafaeb2f9eca91f47b6a8..93c31845693d5f01412402b1db2896e87d5ad9ca 100644 (file)
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -442,9 +442,10 @@ sub _css_link_set {
         return \%set;
     }
     
-    my $user = Bugzilla->user;
+    my $skin_user_prefs = Bugzilla->user->settings->{skin};
     my $cgi_path = bz_locations()->{'cgi_path'};
-    my $all_skins = $user->settings->{'skin'}->legal_values;    
+    # If the DB is not accessible, user settings are not available.
+    my $all_skins = $skin_user_prefs ? $skin_user_prefs->legal_values : [];
     my %skin_urls;
     foreach my $option (@$all_skins) {
         next if $option eq 'standard';
@@ -456,7 +457,7 @@ sub _css_link_set {
     }
     $set{alternate} = \%skin_urls;
     
-    my $skin = $user->settings->{'skin'}->{'value'};
+    my $skin = $skin_user_prefs->{'value'};
     if ($skin ne 'standard' and defined $set{alternate}->{$skin}) {
         $set{skin} = delete $set{alternate}->{$skin};
     }