From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 8 Feb 2004 07:59:57 +0000 (+0000)
Subject: Use wgSiteMessage in no-database abort if it's set
X-Git-Tag: 1.3.0beta1~1009
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=4c7ff09b2898c29fea868bc27c6f225577bc87cf;p=lhc%2Fweb%2Fwiklou.git

Use wgSiteMessage in no-database abort if it's set
---

diff --git a/includes/Database.php b/includes/Database.php
index d98715cc83..60069171af 100644
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -394,9 +394,10 @@ class Database {
 /* Standard fail function, called by default when a connection cannot be established
    Displays the file cache if possible */
 function wfEmergencyAbort( &$conn ) {
-	global $wgTitle, $wgUseFileCache, $title, $wgInputEncoding, $wgOutputEncoding;
+	global $wgTitle, $wgUseFileCache, $title, $wgInputEncoding, $wgSiteNotice, $wgOutputEncoding;
 	
 	header( "Content-type: text/html; charset=$wgOutputEncoding" );
+	$msg = $wgSiteNotice;
 	if($msg == "") $msg = wfMsgNoDB( "noconnect" );
 	$text = $msg;