X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=568a75dce1a8df9cec9a1b52a185599cac7a9daa;hb=87ba780c69ac1af04afc40f2da39282d917f9108;hp=59c231c9b33e52c73c6f69d17c57db35b1ae173e;hpb=ddb86f8d5bd1bd21b2beeeea55baf505b47dfed5;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index 59c231c..568a75d 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -195,10 +195,8 @@ jQuery.extend({
 	lastModified: {},
 	etag: {},
 
-	ajax: function( s ) {
-		// Extend the settings, but re-extend 's' so that it can be
-		// checked again later (in the test suite, specifically)
-		s = jQuery.extend(true, {}, jQuery.ajaxSettings, s);
+	ajax: function( origSettings ) {
+		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings);
 		
 		var jsonp, status, data,
 			callbackContext = s.context || window,
@@ -333,7 +331,7 @@ jQuery.extend({
 		// Need an extra try/catch for cross domain requests in Firefox 3
 		try {
 			// Set the correct header, if data is being sent
-			if ( s.data ) {
+			if ( s.data || origSettings && origSettings.contentType ) {
 				xhr.setRequestHeader("Content-Type", s.contentType);
 			}