Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 0 insertions, 21 deletions

diff --git a/includes/parser/ParserDiffTest.php b/includes/parser/ParserDiffTest.php
index 174c1d61..32f5d068 100644
--- a/includes/parser/ParserDiffTest.php
+++ b/includes/parser/ParserDiffTest.php
@@ -29,7 +29,6 @@ class ParserDiffTest
 	public $parsers;
 	public $conf;
 	public $shortOutput = false;
-	public $dtUniqPrefix;
 
 	public function __construct( $conf ) {
 		if ( !isset( $conf['parsers'] ) ) {
@@ -43,12 +42,6 @@ class ParserDiffTest
 			return;
 		}
 
-		global $wgHooks;
-		static $doneHook = false;
-		if ( !$doneHook ) {
-			$doneHook = true;
-			$wgHooks['ParserClearState'][] = array( $this, 'onClearState' );
-		}
 		if ( isset( $this->conf['shortOutput'] ) ) {
 			$this->shortOutput = $this->conf['shortOutput'];
 		}
@@ -126,18 +119,4 @@ class ParserDiffTest
 			$parser->setFunctionHook( $id, $callback, $flags );
 		}
 	}
-
-	/**
-	 * @param Parser $parser
-	 * @return bool
-	 */
-	public function onClearState( &$parser ) {
-		// hack marker prefixes to get identical output
-		if ( !isset( $this->dtUniqPrefix ) ) {
-			$this->dtUniqPrefix = $parser->uniqPrefix();
-		} else {
-			$parser->mUniqPrefix = $this->dtUniqPrefix;
-		}
-		return true;
-	}
 }