From: Sam Reed <reedy@users.mediawiki.org>
Date: Mon, 18 Apr 2011 19:03:46 +0000 (+0000)
Subject: Revert avars deprecation in r11308
X-Git-Tag: 1.31.0-rc.0~30726
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=85079964ca6d3fc27d674cc74261b5a8f279c0af;p=lhc%2Fweb%2Fwiklou.git

Revert avars deprecation in r11308

Swap a couple of name() to getName()
---

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 097c5957ce..756c337875 100644
--- 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 74cfd918ca..4465e85ab0 100644
--- 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 );