Two quick fixes in relation to #1028. ajaxSetup shouldn't be deep and the boolean...

diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index d9b3a3d8b4d01d808cac67a9a6d81026606610e3..6c08391e0b4056d0e874d90fe6e8c5caea91c470 100644 (file)
--- a/src/ajax/ajax.js
+++ b/src/ajax/ajax.js
@@ -434,7 +434,7 @@ jQuery.extend({
         * @cat Ajax
         */
        ajaxSetup: function( settings ) {
-               jQuery.extend( true, jQuery.ajaxSettings, settings );
+               jQuery.extend( jQuery.ajaxSettings, settings );
        },
 
        ajaxSettings: {

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index a79b2e6b2f83c6f3af48a8c3aefedfc5d66c9d5c..1d2e197970b002b31219ac29ca4066dc4913e1b6 100644 (file)
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1260,7 +1260,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 
        // Handle a deep copy situation
        if ( target.constructor == Boolean ) {
-               deep = true;
+               deep = target;
                target = arguments[1] || {};
        }