Back out one of the changes from the previous commit that wasn't necessary to fix...

diff --git a/src/core.js b/src/core.js
index 4c12150dbb1dc239ca31482b8f636b0f77544e84..62e41c966ea62cdd83fc61c3778304f542144567 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -553,7 +553,7 @@ jQuery.extend = jQuery.fn.extend = function() {
                                        target[ name ] = jQuery.extend( target[ name ], options[ name ] );
 
                                // Don't bring in undefined values
-                               else if ( options[ name ] !== undefined )
+                               else if ( options[ name ] != undefined )
                                        target[ name ] = options[ name ];
 
                        }

diff --git a/test/unit/core.js b/test/unit/core.js
index f03930413d42d2426d53634bb55b10537f41e198..ce70be6887efd92379be6e5cc927a8367c3ce7b8 100644 (file)
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -874,7 +874,7 @@ test("$.extend(Object, Object)", function() {
        ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
 
        var ret = jQuery.extend(true, { foo:"bar" }, { foo:null } );
-       equals( ret.foo, null, "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" );
+       ok( typeof ret.foo !== 'undefined', "Make sure a null value doesn't crash with deep extend, for #1908" );
 
        var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },