summaryrefslogtreecommitdiff
path: root/includes/StubObject.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-06-04 07:31:04 +0200
committerPierre Schmitz <pierre@archlinux.de>2015-06-04 07:58:39 +0200
commitf6d65e533c62f6deb21342d4901ece24497b433e (patch)
treef28adf0362d14bcd448f7b65a7aaf38650f923aa /includes/StubObject.php
parentc27b2e832fe25651ef2410fae85b41072aae7519 (diff)
Update to MediaWiki 1.25.1
Diffstat (limited to 'includes/StubObject.php')
-rw-r--r--includes/StubObject.php27
1 files changed, 23 insertions, 4 deletions
diff --git a/includes/StubObject.php b/includes/StubObject.php
index 8878660b..2dfcdc2f 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];
}
}
@@ -179,6 +180,24 @@ class StubUserLang extends StubObject {
}
/**
+ * 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 );
+ return $wgLang->findVariantLink( $link, $nt, $ignoreOtherCond );
+ }
+
+ /**
* @return Language
*/
public function _newObject() {