From: Derk-Jan Hartman <hartman@users.mediawiki.org>
Date: Mon, 23 Jan 2012 18:11:28 +0000 (+0000)
Subject: Correct mw.Uri.decode to properly decode encoded + signs. Fixes bug 33902
X-Git-Tag: 1.31.0-rc.0~25116
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=c354a5b65419447d740d5e2f675e15ad3298faf7;p=lhc%2Fweb%2Fwiklou.git

Correct mw.Uri.decode to properly decode encoded + signs. Fixes bug 33902
Patch by Fomafix
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 1a2eeb37b3..4180a1cbbd 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -233,6 +233,7 @@ production.
   a null edit.
 * (bug 33880) $wgUsersNotifiedOnAllChanges should not send e-mail to user who made
   the edit.
+* (bug 33902) Decoding %2B with mw.Uri.decode results in ' ' instead of +
 
 === API changes in 1.19 ===
 * Made action=edit less likely to return "unknownerror", by returning the actual error
diff --git a/resources/mediawiki/mediawiki.Uri.js b/resources/mediawiki/mediawiki.Uri.js
index 21d70cc3d8..26fdfa9e55 100644
--- a/resources/mediawiki/mediawiki.Uri.js
+++ b/resources/mediawiki/mediawiki.Uri.js
@@ -160,7 +160,7 @@
 		 * @return {String} decoded string
 		 */
 		Uri.decode = function( s ) {
-			return decodeURIComponent( s ).replace( /\+/g, ' ' );
+			return decodeURIComponent( s.replace( /\+/g, '%20' ) );
 		};
 
 		Uri.prototype = {