From: David Serduke <davidserduke@gmail.com>
Date: Tue, 4 Dec 2007 07:36:03 +0000 (+0000)
Subject: For fix #1999 changed the RegExp to be non-greedy. Thanks emartin24.
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=8b74ba07aabc11c1e987e3c7dfe8314c23bb5452;p=jquery.git

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

diff --git a/src/ajax.js b/src/ajax.js
index d4f2e12..1049614 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -200,7 +200,7 @@ jQuery.extend({
 		if ( s.cache === false && s.type.toLowerCase() == "get" ) {
 			var ts = (new Date()).getTime();
 			// 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
 			s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : "");
 		}