From: Kevin Israel <pleasestand@live.com>
Date: Mon, 20 Oct 2014 06:52:02 +0000 (-0400)
Subject: CoreParserFunctions::displaytitle(): Use Parser::killMarkers()
X-Git-Tag: 1.31.0-rc.0~13563
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%7B%7B%20url_for%28%27vote%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=74cba12de3372acbb6b09c5743c2011d0219ef11;p=lhc%2Fweb%2Fwiklou.git

CoreParserFunctions::displaytitle(): Use Parser::killMarkers()

... instead of doing something similar to an old version of it.

Change-Id: I78db194291236208843a13b80d322d403774796c
---

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 355a3c1216..d45b32f0ed 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -379,8 +379,7 @@ class CoreParserFunctions {
 		$text = $parser->doQuotes( $text );
 
 		// remove stripped text (e.g. the UNIQ-QINU stuff) that was generated by tag extensions/whatever
-		$text = preg_replace( '/' . preg_quote( $parser->uniqPrefix(), '/' ) . '.*?'
-			. preg_quote( Parser::MARKER_SUFFIX, '/' ) . '/', '', $text );
+		$text = $parser->killMarkers( $text );
 
 		// list of disallowed tags for DISPLAYTITLE
 		// these will be escaped even though they are allowed in normal wiki text