Merge branch '6897' of http://github.com/SlexAxton/jquery into SlexAxton-6897

[jquery.git] / src / core.js

diff --git a/src/core.js b/src/core.js
index 3389e83..3a37c4a 100644 (file)
--- a/src/core.js
+++ b/src/core.js
@@ -312,7 +312,7 @@ jQuery.fn.init.prototype = jQuery.fn;
 
 jQuery.extend = jQuery.fn.extend = function() {
        // copy reference to target object
-       var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy, copyIsArray;
+       var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy, copyIsArray, clone;
 
        // Handle a deep copy situation
        if ( typeof target === "boolean" ) {
@@ -424,8 +424,8 @@ jQuery.extend({
                        }
 
                        // Trigger any bound ready events
-                       if ( jQuery.fn.triggerHandler ) {
-                               jQuery( document ).triggerHandler( "ready" );
+                       if ( jQuery.fn.trigger ) {
+                               jQuery( document ).trigger( "ready" ).unbind( "ready" );
                        }
                }
        },