X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=67429f779c22351458aabf5d29facf366154a174;hb=240d8b681e222dcbc50192331ed7ba00b0e07e0e;hp=efb168306de86316036a563437e6eba5079c0091;hpb=23d455b4469f2b47363c21867aad271d6930f112;p=jquery.git

diff --git a/src/core.js b/src/core.js
index efb1683..67429f7 100644
--- a/src/core.js
+++ b/src/core.js
@@ -936,20 +936,15 @@ jQuery.extend({
 	},
 
 	// Check if an object is a deferred
-	isDeferred: function( object , method ) {
-		method = method || "then";
-		return !!( object && object[ method ] && object[ method ]._ === deferredMarker );
+	isDeferred: function( object ) {
+		return !!( object && object.then && object.then._ === deferredMarker );
 	},
 	
 	// Deferred helper
-	when: function( object , method ) {
-		method = method || "then";
-		object = jQuery.isDeferred( object , method ) ?
+	when: function( object ) {
+		object = jQuery.isDeferred( object ) ?
 			object :
 			jQuery.Deferred().resolve( object );
-		object.fail = object.fail || function() { return this; };
-		object[ method ] = object[ method ] || object.then;
-		object.then = object.then || object[ method ];
 		return object;
 	},