From: C. Scott Ananian <cscott@cscott.net>
Date: Tue, 3 Jan 2017 21:47:59 +0000 (-0500)
Subject: Revert "Protect language converter markup in the preprocessor."
X-Git-Tag: 1.31.0-rc.0~4410
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=046c463635e12a7d5336fd298aa6ab53381b016d

Revert "Protect language converter markup in the preprocessor."

This effectively reverts commit 28774022769d2273be16c6c6e1cca710a1fd97ef in
order to unblock the deploy train.  The underlying behavior might not be
incorrect, but it was unexpected.

Bug: T153761
Change-Id: Ifc9c7cf3482dd5d222ff4da24a6d4cc401e9d965
---

diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 950d66d7b7..661318bea1 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -223,7 +223,8 @@ class Preprocessor_DOM extends Preprocessor {
 
 		$searchBase = "[{<\n"; # }
 		if ( !$wgDisableLangConversion ) {
-			$searchBase .= '-';
+			// FIXME: disabled due to T153761
+			// $searchBase .= '-';
 		}
 
 		// For fast reverse searches
diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php
index 1317e60e41..2666c93f87 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -155,7 +155,8 @@ class Preprocessor_Hash extends Preprocessor {
 
 		$searchBase = "[{<\n";
 		if ( !$wgDisableLangConversion ) {
-			$searchBase .= '-';
+			// FIXME: disabled due to T153761
+			// $searchBase .= '-';
 		}
 
 		// For fast reverse searches
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index b6f283056c..f6b6bced07 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -20633,10 +20633,12 @@ language=sr variant=sr-ec
 </p>
 !! end
 
+# FIXME: This test is currently broken in the PHP parser T153761
 !! test
 T146304: Don't break template parsing if language converter markup is in the parameter.
 !! options
 language=sr variant=sr-ec
+disabled
 !! wikitext
 {{echo|-{R|foo}-}}
 !! html/php