Fix typo

[lhc/web/wiklou.git] / includes / MessageCache.php

diff --git a/includes/MessageCache.php b/includes/MessageCache.php
index 0073b2e..d133885 100644 (file)
--- a/includes/MessageCache.php
+++ b/includes/MessageCache.php
@@ -1,8 +1,7 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage Cache
+ * @addtogroup Cache
  */
 
 /**
@@ -17,7 +16,6 @@ define( 'MSG_CACHE_VERSION', 1 );
  * Message cache
  * Performs various MediaWiki namespace-related functions
  *
- * @package MediaWiki
  */
 class MessageCache {
        var $mCache, $mUseCache, $mDisable, $mExpiry;
@@ -25,6 +23,7 @@ class MessageCache {
        var $mExtensionMessages = array();
        var $mInitialised = false;
        var $mDeferred = true;
+       var $mAllMessagesLoaded;
 
        function __construct( &$memCached, $useDB, $expiry, $memcPrefix) {
                wfProfileIn( __METHOD__ );
@@ -298,10 +297,10 @@ class MessageCache {
         * Loads all or main part of cacheable messages from the database
         */
        function loadFromDB() {
-               global $wgLang, $wgMaxMsgCacheEntrySize;
+               global $wgMaxMsgCacheEntrySize;
 
                wfProfileIn( __METHOD__ );
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE );
                $this->mCache = array();
 
                # Load titles for all oversized pages in the MediaWiki namespace
@@ -445,29 +444,30 @@ class MessageCache {
                $message = false;
 
                # Normalise title-case input
-               $key = $wgContLang->lcfirst( $key );
+               $lckey = $wgContLang->lcfirst( $key );
+               $lckey = str_replace( ' ', '_', $lckey );
 
                # Try the MediaWiki namespace
                if( !$this->mDisable && $useDB ) {
-                       $title = $wgContLang->ucfirst( $key );
+                       $title = $wgContLang->ucfirst( $lckey );
                        if(!$isFullKey && ($langcode != $wgContLanguageCode) ) {
                                $title .= '/' . $langcode;
                        }
                        $message = $this->getMsgFromNamespace( $title );
                }
                # Try the extension array
-               if( $message === false && isset( $this->mExtensionMessages[$langcode][$key] ) ) {
-                       $message = $this->mExtensionMessages[$langcode][$key];
+               if( $message === false && isset( $this->mExtensionMessages[$langcode][$lckey] ) ) {
+                       $message = $this->mExtensionMessages[$langcode][$lckey];
                }
-               if ( $message === false && isset( $this->mExtensionMessages['en'][$key] ) ) {
-                       $message = $this->mExtensionMessages['en'][$key];
+               if ( $message === false && isset( $this->mExtensionMessages['en'][$lckey] ) ) {
+                       $message = $this->mExtensionMessages['en'][$lckey];
                }
 
                # Try the array in the language object
                if( $message === false ) {
                        #wfDebug( "Trying language object for message $key\n" );
                        wfSuppressWarnings();
-                       $message = $lang->getMessage( $key );
+                       $message = $lang->getMessage( $lckey );
                        wfRestoreWarnings();
                        if ( is_null( $message ) ) {
                                $message = false;
@@ -475,8 +475,8 @@ class MessageCache {
                }
 
                # Try the array of another language
-               if( $message === false && strpos( $key, '/' ) ) {
-                       $message = explode( '/', $key );
+               if( $message === false && strpos( $lckey, '/' ) ) {
+                       $message = explode( '/', $lckey );
                        if ( $message[1] ) {
                                wfSuppressWarnings();
                                $message = Language::getMessageFor( $message[0], $message[1] );
@@ -493,7 +493,7 @@ class MessageCache {
                if( ($message === false || $message === '-' ) &&
                        !$this->mDisable && $useDB &&
                        !$isFullKey && ($langcode != $wgContLanguageCode) ) {
-                       $message = $this->getMsgFromNamespace( $wgContLang->ucfirst( $key ) );
+                       $message = $this->getMsgFromNamespace( $wgContLang->ucfirst( $lckey ) );
                }
 
                # Final fallback
@@ -546,7 +546,7 @@ class MessageCache {
 
                                if ( $type == ' ' ) {
                                        $message = substr( $entry, 1 );
-                                       $this->mCache[$title] = $message;
+                                       $this->mCache[$title] = $entry;
                                        return $message;
                                } elseif ( $entry == '!NONEXISTENT' ) {
                                        return false;
@@ -576,7 +576,7 @@ class MessageCache {
                return $message;
        }
 
-       function transform( $message ) {
+       function transform( $message, $interface = false ) {
                global $wgParser;
                if ( !$this->mParser && isset( $wgParser ) ) {
                        # Do some initialisation so that we don't have to do it twice
@@ -586,7 +586,10 @@ class MessageCache {
                }
                if ( !$this->mDisableTransform && $this->mParser ) {
                        if( strpos( $message, '{{' ) !== false ) {
-                               $message = $this->mParser->transformMsg( $message, $this->getParserOptions() );
+                               $popts = $this->getParserOptions();
+                               if ( $interface ) { $popts->setInterfaceMessage(true); }
+                               $message = $this->mParser->transformMsg( $message, $popts );
+                               if ( $interface ) { $popts->setInterfaceMessage(false); }
                        }
                }
                return $message;
@@ -628,7 +631,6 @@ class MessageCache {
 
        /**
         * Add a 2-D array of messages by lang. Useful for extensions.
-        * Introduced in 1.9. Please do not use it for now, for backwards compatibility.
         *
         * @param array $messages The array to be added
         */
@@ -671,12 +673,41 @@ class MessageCache {
                }
        }
 
-       static function loadAllMessages() {
+       function loadAllMessages() {
+               global $wgExtensionMessagesFiles;
+               if ( $this->mAllMessagesLoaded ) {
+                       return;
+               }
+               $this->mAllMessagesLoaded = true;
+
                # Some extensions will load their messages when you load their class file
                wfLoadAllExtensions();
                # Others will respond to this hook
                wfRunHooks( 'LoadAllMessages' );
+               # Some register their messages in $wgExtensionMessagesFiles
+               foreach ( $wgExtensionMessagesFiles as $name => $file ) {
+                       if ( $file ) {
+                               $this->loadMessagesFile( $file );
+                               $wgExtensionMessagesFiles[$name] = false;
+                       }
+               }
                # Still others will respond to neither, they are EVIL. We sometimes need to know!
        }
+
+       /**
+        * Load messages from a given file
+        */
+       function loadMessagesFile( $filename ) {
+               $messages = $magicWords = false;
+               require( $filename );
+
+               if ( $messages !== false ) {
+                       $this->addMessagesByLang( $messages );
+               }
+
+               if ( $magicWords !== false ) {
+                       global $wgContLang;
+                       $wgContLang->addMagicWordsByLang( $magicWords );
+               }
+       }
 }
-?>