From: Brion Vibber <brion@users.mediawiki.org>
Date: Mon, 30 Aug 2004 05:11:21 +0000 (+0000)
Subject: When using wfMsgNoDB(), *don't use the cached messsages!*
X-Git-Tag: 1.5.0alpha1~2198
X-Git-Url: http://git.cyclocoop.org/url?a=commitdiff_plain;h=9aafcca999afdec9e3520f5340f7135bc9322f97;p=lhc%2Fweb%2Fwiklou.git

When using wfMsgNoDB(), *don't use the cached messsages!*
This restores Special:Allmessages to working order; previously it was
showing the MediaWiki: message in both columns, which is not too helpful.
---

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 67ec220812..485b10eb3a 100755
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -187,7 +187,7 @@ class MessageCache
 		}
 		
 		$message = false;
-		if ( !$this->mDisable ) {
+		if ( !$this->mDisable && $useDB ) {
 			$title = $wgLang->ucfirst( $key );
 			
 
@@ -197,7 +197,7 @@ class MessageCache
 			}
 			
 			# If it wasn't in the cache, load each message from the DB individually
-			if ( !$message && $useDB) {
+			if ( !$message ) {
 				$dbr =& wfGetDB( DB_SLAVE );
 				$result = $dbr->getArray( 'cur', array('cur_text'), 
 				  array( 'cur_namespace' => NS_MEDIAWIKI, 'cur_title' => $title ),