* Fix raw sitenotice display on database error

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 837d51a..c481ca3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -345,6 +345,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 675) Add page protection level for unregistered/new accounts
 * User::isNewbie now uses the registration date and $wgAutoconfirmAge
 * Log views show message when no matches
+* Fix raw sitenotice display on database error
 
 
 === Caveats ===

diff --git a/includes/Database.php b/includes/Database.php
index df56815..9dc7bd3 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1797,11 +1797,8 @@ border=\"0\" ALT=\"Google\"></A>
 
        wfLogDBError( "Connection error: $error\n" );
        
-       $msg = wfGetSiteNotice();
-       if($msg == '') {
-               $msg = str_replace( '$1', $error, $noconnect );
-       }
-       $text = $msg;
+       $text = str_replace( '$1', $error, $noconnect );
+       $text .= wfGetSiteNotice();
 
        if($wgUseFileCache) {
                if($wgTitle) {

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 8b97d8d..7bfa34a 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1298,7 +1298,12 @@ function wfGetSiteNotice() {
                $notice = $wgSiteNotice;
        }
        if($notice != '-' && $notice != '') {
-               $notice = $wgOut->parse( $notice );
+               if( is_object( $wgOut ) ) {
+                       $notice = $wgOut->parse( $notice );
+               } else {
+                       wfDebug( "wfGetSiteNotice called with no \$wgOut available" );
+                       $notice = '';
+               }
        }
        wfProfileOut( $fname );
        return $notice;