Ticket #4227: extend_object_with_length.patch

jquery/test/unit/core.js

@@ -404 +404 @@
 });
 
 test("jQuery.extend(Object, Object)", function() {
-        expect(20);
+        expect(21);
 
         var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                 options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -461 +461 @@
         jQuery.extend(func, { key: "value" } );
         equals( func.key, "value", "Verify a function can be extended" );
 
+        var ret = jQuery.extend(true, {},{ foo: { length: 'bar'} });
+        ok( !jQuery.isArray( ret ), "Should not convert an ofject with a length property to an array, for #4227" );
+
         var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                 defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
                 options1 = { xnumber2: 1, xstring2: "x" },

jquery/src/core.js

@@ -235 +235 @@
                                 if ( deep && copy && typeof copy === "object" && !copy.nodeType )
                                         target[ name ] = jQuery.extend( deep, 
                                                 // Never move original objects, clone them
-                                                src || ( copy.length != null ? [ ] : { } )
+                                                src || ( jQuery.isArray( copy ) ? [ ] : { } )
                                         , copy );
 
                                 // Don't bring in undefined values
@@ -442 +442 @@
         opera: /opera/.test( userAgent ),
         msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
         mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent )
-};
- No newline at end of file
+};