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 67ec220..485b10e 100755 (executable)
--- 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 ),