Merge branch 'master' of http://github.com/aakoch/jquery into aakoch-master

diff --git a/src/ajax.js b/src/ajax.js
index ef0e1d8..31efc56 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -8,7 +8,7 @@ var jsc = jQuery.now(),
        rbracket = /\[\]$/,
        jsre = /\=\?(&|$)/,
        rquery = /\?/,
-       rts = /([?&])_=[^&]*(&?)/,
+       rts = /([?&])_=[^&]*/,
        rurl = /^(\w+:)?\/\/([^\/?#]+)/,
        r20 = /%20/g,
        rhash = /#.*$/,
@@ -278,7 +278,7 @@ jQuery.extend({
                        var ts = jQuery.now();
 
                        // try replacing _= if it is there
-                       var ret = s.url.replace(rts, "$1_=" + ts + "$2");
+                       var ret = s.url.replace(rts, "$1_=" + ts);
 
                        // if nothing was replaced, add timestamp to the end
                        s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");