From fbeef2d0fbd320c979f7d6daa3323142a8b3eccd Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 14 Aug 2005 07:21:43 +0000
Subject: [PATCH] respect $useDB

---
 includes/MessageCache.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index d51e18dac2..5099e07427 100755
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -139,6 +139,9 @@ class MessageCache
 	function loadFromDB() {
 		$fname = 'MessageCache::loadFromDB';
 		$dbr =& wfGetDB( DB_SLAVE );
+		if ( !$dbr ) {
+			wfDebugDieBacktrace( 'Invalid database object' );
+		}
 		$conditions = array( 'page_is_redirect' => 0,
 					'page_namespace' => NS_MEDIAWIKI);
 		$res = $dbr->select( array( 'page', 'revision', 'text' ),
@@ -243,7 +246,7 @@ class MessageCache
 			return '&lt;' . htmlspecialchars($key) . '&gt;';
 		}
 		# If cache initialization was deferred, start it now.
-		if( $this->mDeferred ) {
+		if( $this->mDeferred && !$this->mDisable && $useDB ) {
 			$this->load();
 		}
 
-- 
2.20.1