For fix #1999 changed the RegExp to be non-greedy. Thanks emartin24.

This commit is contained in:
David Serduke 2007-12-04 07:36:03 +00:00
parent aee221d33c
commit 8b74ba07aa

View File

@ -200,7 +200,7 @@ jQuery.extend({
if ( s.cache === false && s.type.toLowerCase() == "get" ) { if ( s.cache === false && s.type.toLowerCase() == "get" ) {
var ts = (new Date()).getTime(); var ts = (new Date()).getTime();
// try replacing _= if it is there // try replacing _= if it is there
var ret = s.url.replace(/(\?|&)_=.*(&|$)/, "$1_=" + ts + "$2"); var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2");
// if nothing was replaced, add timestamp to the end // if nothing was replaced, add timestamp to the end
s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : ""); s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
} }