C. Scott Ananian has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330315 )
Change subject: Revert "Protect language converter markup in the preprocessor."
......................................................................
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
---
M includes/parser/Preprocessor_DOM.php
M includes/parser/Preprocessor_Hash.php
M tests/parser/parserTests.txt
3 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/15/330315/1
diff --git a/includes/parser/Preprocessor_DOM.php
b/includes/parser/Preprocessor_DOM.php
index 950d66d..25929ec 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -223,7 +223,8 @@
$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 1317e60..ee11ecb 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -155,7 +155,8 @@
$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 b6f2830..f6b6bce 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -20633,10 +20633,12 @@
</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
--
To view, visit https://gerrit.wikimedia.org/r/330315
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc9c7cf3482dd5d222ff4da24a6d4cc401e9d965
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: C. Scott Ananian <canan...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
