X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguageConverter.php;h=ccf9b1e06ac63d14490d7788ee923960e0a68099;hb=51f2a693af7523bc055e31e4c1b3ddd766a3e9de;hp=79ddb6ac8638792c1a2590400dc0d26aa24003fe;hpb=f8b7276da00903dbbf7c38fabaa427b96323a079;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 79ddb6ac86..ccf9b1e06a 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -1263,7 +1263,10 @@ class ConverterRule {
 		$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 );