From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 27 May 2014 18:53:00 +0000 (+0000)
Subject: Merge "Remove silly 'm' prefix from StubObject/DeprecatedGlobal members"
X-Git-Tag: 1.31.0-rc.0~15566
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=b941a11623ee1eac9418051a92cc679f41d99c44;p=lhc%2Fweb%2Fwiklou.git

Merge "Remove silly 'm' prefix from StubObject/DeprecatedGlobal members"
---

b941a11623ee1eac9418051a92cc679f41d99c44
diff --cc includes/DeprecatedGlobal.php
index d1fda2ebf0,3ba2211a4e..14329d3213
--- a/includes/DeprecatedGlobal.php
+++ b/includes/DeprecatedGlobal.php
@@@ -31,15 -30,11 +30,15 @@@ class DeprecatedGlobal extends StubObje
  
  	function __construct( $name, $realValue, $version = false ) {
  		parent::__construct( $name );
- 		$this->mRealValue = $realValue;
- 		$this->mVersion = $version;
+ 		$this->realValue = $realValue;
+ 		$this->version = $version;
  	}
  
 +	// @codingStandardsIgnoreStart
 +	// PSR2.Methods.MethodDeclaration.Underscore
 +	// PSR2.Classes.PropertyDeclaration.ScopeMissing
  	function _newObject() {
 +
  		/* Put the caller offset for wfDeprecated as 6, as
  		 * that gives the function that uses this object, since:
  		 * 1 = this function ( _newObject )
@@@ -52,8 -47,7 +51,8 @@@
  		 * sequences for this method, but that seems to be
  		 * rather unlikely.
  		 */
- 		wfDeprecated( '$' . $this->mGlobal, $this->mVersion, false, 6 );
- 		return $this->mRealValue;
+ 		wfDeprecated( '$' . $this->global, $this->version, false, 6 );
+ 		return $this->realValue;
  	}
 +	// @codingStandardsIgnoreEnd
  }