* Actually use $wgMessageCacheType for the MessageCache

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0346f82..00a1afc 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -60,6 +60,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   Default: false
 * Removed $wgEnableCascadingProtection option. Disabling cascading protection
   is no longer possible. 
+* $wgMessageCacheType defines now the type of cache used by the MessageCache class,
+  previously it was choosen based on $wgParserCacheType
 
 === New features in 1.13 ===
 

diff --git a/includes/Setup.php b/includes/Setup.php
index c5d3f1b..80e728d 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -195,8 +195,8 @@ $messageMemc =& wfGetMessageCacheStorage();
 $parserMemc =& wfGetParserCacheStorage();
 
 wfDebug( 'Main cache: ' . get_class( $wgMemc ) .
-       "\nMessage cache: " . get_class( $messageMemc ) .
-          "\nParser cache: " . get_class( $parserMemc ) . "\n" );
+       "\nMessage cache: " . get_class( $messageMemc ) .
+       "\nParser cache: " . get_class( $parserMemc ) . "\n" );
 
 wfProfileOut( $fname.'-memcached' );
 wfProfileIn( $fname.'-SetupSession' );
@@ -241,7 +241,7 @@ $wgOut = new StubObject( 'wgOut', 'OutputPage' );
 $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) );
 
 $wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
-       array( $parserMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, wfWikiID() ) );
+       array( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, wfWikiID() ) );
 
 wfProfileOut( $fname.'-globals' );
 wfProfileIn( $fname.'-User' );