http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88298
Revision: 88298
Author: neilk
Date: 2011-05-17 12:43:22 +0000 (Tue, 17 May 2011)
Log Message:
-----------
fix params when no equal sign
Modified Paths:
--------------
trunk/extensions/UploadWizard/resources/mw.Uri.js
Modified: trunk/extensions/UploadWizard/resources/mw.Uri.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.Uri.js 2011-05-17 12:41:41 UTC
(rev 88297)
+++ trunk/extensions/UploadWizard/resources/mw.Uri.js 2011-05-17 12:43:22 UTC
(rev 88298)
@@ -158,10 +158,10 @@
q = {};
// using replace to iterate over a string
if ( uri.query ) {
- uri.query.replace(
/(?:^|&)([^&=]*)(?:=([^&]*))?/g, function ($0, $1, $2) {
+ uri.query.replace(
/(?:^|&)([^&=]*)(?:(=)([^&]*))?/g, function ($0, $1, $2, $3) {
if ( $1 ) {
var k = mw.Uri.decode( $1 );
- var v = mw.isDefined( $2 ) ?
mw.Uri.decode( $2 ) : null;
+ var v = ($2 == '') ? null :
mw.Uri.decode( $3 );
if ( typeof q[ k ] === 'string'
) {
q[ k ] = [ q[ k ] ];
}
@@ -210,8 +210,10 @@
var args = [];
var _this = this;
$.each( this.query, function( key, val ) {
- $.each( $.makeArray( val ), function( i, v ) {
- args.push( mw.Uri.encode( key ) + ( v
=== null ? '' : '=' + mw.Uri.encode( v ) ) );
+ var k = mw.Uri.encode( key );
+ var vals = val === null ? [ null ] :
$.makeArray( val );
+ $.each( vals, function( i, v ) {
+ args.push( k + ( v === null ? '' : '='
+ mw.Uri.encode( v ) ) );
} );
} );
return args.join( '&' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
