aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ajax/ajax.js2
-rw-r--r--src/jquery/jquery.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ajax/ajax.js b/src/ajax/ajax.js
index d9b3a3d8b..6c08391e0 100644
--- 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 a79b2e6b2..1d2e19797 100644
--- 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] || {};
}