From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Wed, 16 Jul 2014 21:04:20 +0000 (-0400)
Subject: HTMLForm: Avoid usage of non-standard 'flags' parameter of String#replace
X-Git-Tag: 1.31.0-rc.0~14589
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=9538e7d77c9a456cbacc59d2ea20a816a9bd3c63;p=lhc%2Fweb%2Fwiklou.git

HTMLForm: Avoid usage of non-standard 'flags' parameter of String#replace

Chrome (and most other browser) don't support the non-standard 'flags'
argument to String#replace (implemented by Mozilla Firefox). Instead pass
a RegExp object with those flags.

Bug: 68050
Change-Id: Ia463002e708975eed1a5c3657f2e1a4d6b4e74de
---

diff --git a/resources/Resources.php b/resources/Resources.php
index d3f8f7d55b..a66faa6908 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -862,6 +862,9 @@ return array(
 	),
 	'mediawiki.htmlform' => array(
 		'scripts' => 'resources/src/mediawiki/mediawiki.htmlform.js',
+		'dependencies' => array(
+			'jquery.mwExtension',
+		),
 		'messages' => array( 'htmlform-chosen-placeholder' ),
 	),
 	'mediawiki.icon' => array(
diff --git a/resources/src/mediawiki/mediawiki.htmlform.js b/resources/src/mediawiki/mediawiki.htmlform.js
index 9eea492e45..5027f7a016 100644
--- a/resources/src/mediawiki/mediawiki.htmlform.js
+++ b/resources/src/mediawiki/mediawiki.htmlform.js
@@ -363,7 +363,8 @@
 			$ul = $( this ).prev( 'ul.mw-htmlform-cloner-ul' );
 
 			html = $ul.data( 'template' ).replace(
-				$ul.data( 'uniqueId' ), 'clone' + ( ++cloneCounter ), 'g'
+				new RegExp( $.escapeRE( $ul.data( 'uniqueId' ) ), 'g' ),
+				'clone' + ( ++cloneCounter )
 			);
 
 			$li = $( '<li>' )