Merge pull request #420 from SemanticMediaWiki/bug-62856

MW 1.24+ / Hotfix for missing Redirect caused by bug 62856
SemanticMediaWiki · Jul 18, 2014 · 87c8436 · 87c8436
2 parents e399b95 + 682cbec
commit 87c8436
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/includes/ContentParser.php b/includes/ContentParser.php
@@ -37,6 +37,11 @@ class ContentParser {
 	/** @var array */
 	protected $errors = array();
 
+	/**
+	 * @var boolean
+	 */
+	private $enabledToUseContentHandler = true;
+
 	/**
 	 * @note Injecting new Parser() alone will not yield an expected result and
 	 * doing new Parser( $GLOBALS['wgParserConf'] brings no benefits therefore
@@ -66,6 +71,15 @@ public function setRevision( Revision $revision = null ) {
 		return $this;
 	}
 
+	/**
+	 * @bug 62856 and #212
+	 *
+	 * @since 2.0
+	 */
+	public function forceToUseParser() {
+		$this->enabledToUseContentHandler = false;
+	}
+
 	/**
 	 * @since 1.9
 	 *
@@ -108,7 +122,7 @@ public function parse( $text = null ) {
 			return $this->parseText( $text );
 		}
 
-		if ( $this->hasContentHandler() ) {
+		if ( $this->hasContentHandler() && $this->enabledToUseContentHandler ) {
 			return $this->fetchFromContent();
 		}
 

diff --git a/includes/src/MediaWiki/Jobs/UpdateJob.php b/includes/src/MediaWiki/Jobs/UpdateJob.php
@@ -103,6 +103,7 @@ private function runContentParser() {
 			'Title' => $this->getTitle()
 		) );
 
+		$contentParser->forceToUseParser();
 		$contentParser->parse();
 
 		if ( !( $contentParser->getOutput() instanceof ParserOutput ) ) {

diff --git a/tests/phpunit/Util/PageRefresher.php b/tests/phpunit/Util/PageRefresher.php
@@ -55,6 +55,7 @@ public function doRefresh( $title ) {
 		}
 
 		$contentParser = new ContentParser( $title );
+		$contentParser->forceToUseParser();
 
 		$parserData = Application::getInstance()->newParserData(
 			$title,