jenkins-bot has submitted this change and it was merged.
Change subject: Don't match HTML entities in language conversion syntax
......................................................................
Don't match HTML entities in language conversion syntax
RegEx provided by Gabriel Wicke.
Change-Id: Idca127acc6f4cdc159ee85d5f816a5d120cbe44e
---
M languages/LanguageConverter.php
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 79ddb6a..ccf9b1e 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -1263,7 +1263,10 @@
$variants = $this->mConverter->mVariants;
$varsep_pattern = $this->mConverter->getVarSeparatorPattern();
+ // Split according to $varsep_pattern, but ignore semicolons
from HTML entities
+ $rules = preg_replace( '/(&[#a-zA-Z0-9]+);/', "$1\x01", $rules
);
$choice = preg_split( $varsep_pattern, $rules );
+ $choice = str_replace( "\x01", ';', $choice );
foreach ( $choice as $c ) {
$v = explode( ':', $c, 2 );
--
To view, visit https://gerrit.wikimedia.org/r/83112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idca127acc6f4cdc159ee85d5f816a5d120cbe44e
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Liangent <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: PleaseStand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
