From 8cf14894c631c845348c261c1ab5c479b7cfd20c Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Wed, 9 Mar 2011 21:50:00 +0000
Subject: [PATCH] Escape minus in $.escapeRE * Follow-up r83287: Removing slash
 before caret(^), apparently not needed. * Escaping minus (-), adding the
 minus symbol (added in r83284), causes all uppercase characters and numbers
 to be escaped: (bug 27960) $.escapeRE shouldn't escape all uppercase and
 numbers * Added more compelete tets to the JS Test Suite for $.escapeRE to
 avoid problems in the future

---
 resources/mediawiki.util/mediawiki.util.test.js | 13 +++++++++++--
 resources/mediawiki/mediawiki.js                |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/resources/mediawiki.util/mediawiki.util.test.js b/resources/mediawiki.util/mediawiki.util.test.js
index f98632ed9d..fa670bc226 100644
--- a/resources/mediawiki.util/mediawiki.util.test.js
+++ b/resources/mediawiki.util/mediawiki.util.test.js
@@ -138,8 +138,17 @@
 						mw.test.addTest( 'typeof $.escapeRE',
 							'function (string)' );
 
-						mw.test.addTest( '$.escapeRE( ".st{e}$st" )',
-							'\\.st\\{e\\}\\$st (string)' );
+						mw.test.addTest( '$.escapeRE( "<!-- ([{+mW+}]) $^|?>" )',
+							'<!\\-\\- \\(\\[\\{\\+mW\\+\\}\\]\\) \\$\\^\\|\\?> (string)' ); // double escaped
+
+						mw.test.addTest( '$.escapeRE( "ABCDEFGHIJKLMNOPQRSTUVWXYZ" )',
+							'ABCDEFGHIJKLMNOPQRSTUVWXYZ (string)' );
+
+						mw.test.addTest( '$.escapeRE( "abcdefghijklmnopqrstuvwxyz" )',
+							'abcdefghijklmnopqrstuvwxyz (string)' );
+
+						mw.test.addTest( '$.escapeRE( "0123456789" )',
+							'0123456789 (string)' );
 
 						mw.test.addTest( 'typeof $.isEmpty',
 							'function (string)' );
diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index b84a2c3d82..5c842cd24f 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -14,7 +14,7 @@ jQuery.extend({
 		return str.substr( 0, 1 ).toUpperCase() + str.substr( 1, str.length );
 	},
 	escapeRE : function( str ) {
-		return str.replace ( /([\\{}()|.?*+-\^$\[\]])/g, "\\$1" );
+		return str.replace ( /([\\{}()|.?*+\-^$\[\]])/g, "\\$1" );
 	},
 	// $.isDomElement( document.getElementById('content') ) === true
 	// $.isDomElement( document.getElementsByClassName('portal') ) === false (array)
-- 
2.20.1