Changing back to $wgUser in SpecialImport.php. Importing pages returned "call to...

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

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 663d7a7..d157938 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -197,13 +197,11 @@ class MagicWord {
         * @return MagicWord
         */
        static function &get( $id ) {
-               wfProfileIn( __METHOD__ );
                if ( !isset( self::$mObjects[$id] ) ) {
                        $mw = new MagicWord();
                        $mw->load( $id );
                        self::$mObjects[$id] = $mw;
                }
-               wfProfileOut( __METHOD__ );
                return self::$mObjects[$id];
        }
 
@@ -251,7 +249,7 @@ class MagicWord {
        /**
         * Get a MagicWordArray of double-underscore entities
         *
-        * @return array
+        * @return MagicWordArray
         */
        static function getDoubleUnderscoreArray() {
                if ( is_null( self::$mDoubleUnderscoreArray ) ) {
@@ -275,6 +273,7 @@ class MagicWord {
         */
        function load( $id ) {
                global $wgContLang;
+               wfProfileIn( __METHOD__ );
                $this->mId = $id;
                $wgContLang->getMagic( $this );
                if ( !$this->mSynonyms ) {
@@ -282,6 +281,7 @@ class MagicWord {
                        #throw new MWException( "Error: invalid magic word '$id'" );
                        wfDebugLog( 'exception', "Error: invalid magic word '$id'\n" );
                }
+               wfProfileOut( __METHOD__ );
        }
 
        /**