X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStubObject.php;h=49155d6d996b75fda6b9caf16992f5cbb96aa0bd;hb=6ae9367cddf8565c948f4d9458b07bb688f2ddc2;hp=8878660b7303be83ea3f6df91d727d523d29db78;hpb=3c64eb81bdf669a63628ca2fcf37be1241220e9a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/StubObject.php b/includes/StubObject.php
index 8878660b73..49155d6d99 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -110,7 +110,11 @@ class StubObject {
 	 * @return object
 	 */
 	public function _newObject() {
-		return MWFunction::newObj( $this->class, $this->params );
+		return ObjectFactory::getObjectFromSpec( array(
+			'class' => $this->class,
+			'args' => $this->params,
+			'closure_expansion' => false,
+		) );
 	}
 
 	/**
@@ -146,10 +150,8 @@ class StubObject {
 
 		if ( get_class( $GLOBALS[$this->global] ) != $this->class ) {
 			$fname = __METHOD__ . '-' . $this->global;
-			wfProfileIn( $fname );
 			$caller = wfGetCaller( $level );
 			if ( ++$recursionLevel > 2 ) {
-				wfProfileOut( $fname );
 				throw new MWException( "Unstub loop detected on call of "
 					. "\${$this->global}->$name from $caller\n" );
 			}
@@ -157,7 +159,6 @@ class StubObject {
 				. "\${$this->global}::$name from $caller\n" );
 			$GLOBALS[$this->global] = $this->_newObject();
 			--$recursionLevel;
-			wfProfileOut( $fname );
 			return $GLOBALS[$this->global];
 		}
 	}
@@ -178,6 +179,24 @@ class StubUserLang extends StubObject {
 		return $this->_call( $name, $args );
 	}
 
+	/**
+	 * 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
 	 */