Update RELEASE-NOTES-1.34 for various backports

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

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 9213076..2052c44 100644 (file)
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -79,7 +79,7 @@ class StubObject {
         * @return bool True if $obj is not an instance of StubObject class.
         */
        public static function isRealObject( $obj ) {
-               return is_object( $obj ) && !$obj instanceof StubObject;
+               return is_object( $obj ) && !$obj instanceof self;
        }
 
        /**
@@ -91,7 +91,7 @@ class StubObject {
         * @return void
         */
        public static function unstub( &$obj ) {
-               if ( $obj instanceof StubObject ) {
+               if ( $obj instanceof self ) {
                        $obj = $obj->_unstub( 'unstub', 3 );
                }
        }
@@ -153,7 +153,7 @@ class StubObject {
        public function _unstub( $name = '_unstub', $level = 2 ) {
                static $recursionLevel = 0;
 
-               if ( !$GLOBALS[$this->global] instanceof StubObject ) {
+               if ( !$GLOBALS[$this->global] instanceof self ) {
                        return $GLOBALS[$this->global]; // already unstubbed.
                }
 
@@ -171,38 +171,3 @@ class StubObject {
                }
        }
 }
-
-/**
- * Stub object for the user language. Assigned to the $wgLang global.
- */
-class StubUserLang extends StubObject {
-
-       public function __construct() {
-               parent::__construct( 'wgLang' );
-       }
-
-       /**
-        * Call Language::findVariantLink after unstubbing $wgLang.
-        *
-        * This method is implemented with a full signature rather than relying on
-        * __call so that the pass-by-reference signature of the proxied method is
-        * honored.
-        *
-        * @param string &$link The name of the link
-        * @param Title &$nt The title object of the link
-        * @param bool $ignoreOtherCond To disable other conditions when
-        *   we need to transclude a template or update a category's link
-        */
-       public function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
-               global $wgLang;
-               $this->_unstub( 'findVariantLink', 3 );
-               $wgLang->findVariantLink( $link, $nt, $ignoreOtherCond );
-       }
-
-       /**
-        * @return Language
-        */
-       public function _newObject() {
-               return RequestContext::getMain()->getLanguage();
-       }
-}