From 2e129759b44c022cdee5ce1057a7693d2a081263 Mon Sep 17 00:00:00 2001
From: jaubourg <aubourg.julian@gmail.com>
Date: Sat, 11 Dec 2010 01:35:46 +0100
Subject: [PATCH] More variable renaming to avoid conflicts when module
 closures are removed.

---
 src/transports/jsonp.js | 4 ++--
 src/xhr.js              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/transports/jsonp.js b/src/transports/jsonp.js
index d73781f5..d9e77f2f 100644
--- a/src/transports/jsonp.js
+++ b/src/transports/jsonp.js
@@ -2,7 +2,7 @@
 
 var jsc = jQuery.now(),
 	jsre = /\=\?(&|$)/,
-	rquerymark = /\?/;
+	rquery_jsonp = /\?/;
 
 // Default jsonp callback name
 jQuery.ajaxSettings.jsonpCallback = function() {
@@ -29,7 +29,7 @@ jQuery.xhr.prefilter( function(s) {
 			data = s.url == url && typeof(s.data) === "string" ? s.data.replace(jsre, "=" + jsonpCallback + "$1") : s.data;
 			
 		if ( url == s.url && data == s.data ) {
-			url = url += (rquerymark.test( url ) ? "&" : "?") + jsonp + "=" + jsonpCallback;
+			url = url += (rquery_jsonp.test( url ) ? "&" : "?") + jsonp + "=" + jsonpCallback;
 		}
 		
 		s.url = url;
diff --git a/src/xhr.js b/src/xhr.js
index 66be4636..c458704e 100644
--- a/src/xhr.js
+++ b/src/xhr.js
@@ -1,6 +1,6 @@
 (function( jQuery ) {
 
-var rquery = /\?/,
+var rquery_xhr = /\?/,
 	rhash = /#.*$/,
 	rheaders = /^(.*?):\s*(.*?)\r?$/mg, // IE leaves an \r character at EOL
 	rnoContent = /^(?:GET|HEAD)$/,
@@ -109,7 +109,7 @@ jQuery.xhr = function( _native ) {
 				
 				// If data is available, append data to url
 				if ( data ) {
-					url += (rquery.test(url) ? "&" : "?") + data;
+					url += (rquery_xhr.test(url) ? "&" : "?") + data;
 				}
 								
 				// Add anti-cache in url if needed
@@ -120,7 +120,7 @@ jQuery.xhr = function( _native ) {
 						ret = url.replace(rts, "$1_=" + ts );
 						
 					// if nothing was replaced, add timestamp to the end
-					url = ret + ((ret == url) ? (rquery.test(url) ? "&" : "?") + "_=" + ts : "");
+					url = ret + ((ret == url) ? (rquery_xhr.test(url) ? "&" : "?") + "_=" + ts : "");
 				}
 				
 				s.url = url;