Revert avars deprecation in r11308

Swap a couple of name() to getName()

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 097c595..756c337 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -380,20 +380,11 @@ class SpecialPage {
                }
        }
 
-       /**#@+
-         * Accessor
-         *
-         * @deprecated
-         */
        function getName() { return $this->mName; }
        function getRestriction() { return $this->mRestriction; }
        function getFile() { return $this->mFile; }
        function isListed() { return $this->mListed; }
-       /**#@-*/
 
-       /**#@+
-         * Accessor and mutator
-         */
        function name( $x = null ) { return wfSetVar( $this->mName, $x ); }
        function restrictions( $x = null) {
                # Use the one below this
@@ -406,7 +397,6 @@ class SpecialPage {
        function file( $x = null) { return wfSetVar( $this->mFile, $x ); }
        function includable( $x = null ) { return wfSetVar( $this->mIncludable, $x ); }
        function including( $x = null ) { return wfSetVar( $this->mIncluding, $x ); }
-       /**#@-*/
 
        /**
         * Get the localised name of the special page
@@ -506,7 +496,7 @@ class SpecialPage {
                global $wgContLang;
 
                if( $summaryMessageKey == '' ) {
-                       $msg = $wgContLang->lc( $this->name() ) . '-summary';
+                       $msg = $wgContLang->lc( $this->getName() ) . '-summary';
                } else {
                        $msg = $summaryMessageKey;
                }

diff --git a/includes/SpecialPageFactory.php b/includes/SpecialPageFactory.php
index 74cfd91..4465e85 100644 (file)
--- a/includes/SpecialPageFactory.php
+++ b/includes/SpecialPageFactory.php
@@ -457,7 +457,7 @@ class SpecialPageFactory {
                $page->including( $including );
 
                // Execute special page
-               $profName = 'Special:' . $page->name();
+               $profName = 'Special:' . $page->getName();
                wfProfileIn( $profName );
                $page->execute( $par );
                wfProfileOut( $profName );