From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 9 Jul 2015 14:54:47 +0000 (+0000)
Subject: Merge "T105242: U is for urlencode"
X-Git-Tag: 1.31.0-rc.0~10837
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=6a779b59a26d60dadf0aa6517c9e861444bd49c5;hp=b95d41c62b9ba913f9f96388a9f9a39061aa6a19;p=lhc%2Fweb%2Fwiklou.git

Merge "T105242: U is for urlencode"
---

diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index cf8cd41009..8a30ad1a22 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -178,7 +178,9 @@ class CoreParserFunctions {
 			default:
 				$func = 'urlencode';
 		}
-		return $parser->markerSkipCallback( $s, $func );
+		// See T105242, where the choice to kill markers and various
+		// other options were discussed.
+		return $func( $parser->killMarkers( $s ) );
 	}
 
 	public static function lcfirst( $parser, $s = '' ) {
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 6700225c64..c71874b015 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -20370,10 +20370,12 @@ Strip marker in urlencode
 {{urlencode:x<nowiki/>y}}
 {{urlencode:x<nowiki/>y|wiki}}
 {{urlencode:x<nowiki/>y|path}}
+{{urlencode:x<pre id="one">two</pre>y}}
 !! html
 <p>xy
 xy
 xy
+xy
 </p>
 !! end