Prevents tests for replaceInData to take place if replaceInUrl is already true.

diff --git a/src/ajax/jsonp.js b/src/ajax/jsonp.js
index 6b82b8262626f76b7a85ff637750769f49b61f60..3e3ea85a3eb67f60bc0570e2747d5bff7389c667 100644 (file)
--- a/src/ajax/jsonp.js
+++ b/src/ajax/jsonp.js
@@ -23,7 +23,7 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
                url = s.url,
                hasCallback = s.jsonp !== false,
                replaceInUrl = hasCallback && rjsonp.test( url ),
-               replaceInData = hasCallback && typeof data === "string" &&
+               replaceInData = hasCallback && !replaceInUrl && typeof data === "string" &&
                        !( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") &&
                        rjsonp.test( data );