X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=915bbaa3e73d987799437bf2ee293031f515ea54;hb=3b50eaca2cd0b1439235e39c4e98a6438e8f55b2;hp=a40e223e76dd599790c08e18c086a11feb268922;hpb=9bd9ebdd73fe0e2d29fadf82947c98adde4023e7;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index a40e223..915bbaa 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -208,6 +208,12 @@ jQuery.extend({
 			s.data = jQuery.param( s.data, s.traditional );
 		}
 
+		// If the jsonpCallback has been set, we can assume that dataType is jsonp
+		// Ticket #5803
+		if ( s.jsonpCallback ) {
+		  s.dataType = "jsonp";
+		}
+
 		// Handle JSONP Parameter Callbacks
 		if ( s.dataType === "jsonp" ) {
 			if ( type === "GET" ) {