Quote $default in PostgresUpdater::setDefault

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

diff --git a/includes/DeprecatedGlobal.php b/includes/DeprecatedGlobal.php
index d1fda2e..60dde40 100644 (file)
--- a/includes/DeprecatedGlobal.php
+++ b/includes/DeprecatedGlobal.php
@@ -24,22 +24,23 @@
  * Class to allow throwing wfDeprecated warnings
  * when people use globals that we do not want them to.
  */
-
 class DeprecatedGlobal extends StubObject {
-       // The m's are to stay consistent with parent class.
-       protected $mRealValue, $mVersion;
+       protected $version;
 
-       function __construct( $name, $realValue, $version = false ) {
-               parent::__construct( $name );
-               $this->mRealValue = $realValue;
-               $this->mVersion = $version;
+       /**
+        * @param string $name Global name
+        * @param callable|string $callback Factory function or class name to construct
+        * @param bool|string $version Version global was deprecated in
+        */
+       function __construct( $name, $callback, $version = false ) {
+               parent::__construct( $name, $callback );
+               $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 +53,8 @@ class DeprecatedGlobal extends StubObject {
                 * 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 parent::_newObject();
        }
        // @codingStandardsIgnoreEnd
 }