Fix for r45512: cache the result of LanguageGetLocalizedLanguageNames hook so that...

diff --git a/languages/Language.php b/languages/Language.php
index eaec2b6..dae3952 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -55,6 +55,7 @@ class FakeConverter {
 class Language {
        var $mConverter, $mVariants, $mCode, $mLoaded = false;
        var $mMagicExtensions = array(), $mMagicHookDone = false;
+       var $mLocalizedLanguagesNames = null;
 
        static public $mLocalisationKeys = array(
                'fallback', 'namespaceNames', 'mathNames', 'bookstoreList',
@@ -409,6 +410,19 @@ class Language {
                return $names;
        }
 
+       /**
+        * Get localized language names
+        *
+        * @return array
+        */
+       function getLocalizedLanguageNames() {
+               if( !is_array( $this->mLocalizedLanguagesNames ) ) {
+                       $this->mLocalizedLanguagesNames = array();
+                       wfRunHooks( 'LanguageGetLocalizedLanguageNames', array( &$this->mLocalizedLanguagesNames, $this->getCode() ) );
+               }
+               return $this->mLocalizedLanguagesNames;
+       }
+
        /**
         * Get a message from the MediaWiki namespace.
         *
@@ -431,8 +445,7 @@ class Language {
                        return '';
                }
                if( $localized ) {
-                       $languageNames = array();
-                       wfRunHooks( 'LanguageGetLocalizedLanguageNames', array( &$languageNames, $this->getCode() ) );
+                       $languageNames = $this->getLocalizedLanguageNames();
                        return isset( $languageNames[$code] ) ? $languageNames[$code] : $names[$code];
                } else {
                        return $names[$code];