X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fcore.js;h=3763cd0fe300ec3826fc140d1834de75110298c5;hb=5237b09602d5e360da361823748b0f34861b5a9a;hp=57a42d09ea4093a26e1b6f03f3135d9e92729142;hpb=846c52d1f8535a6283dcc42c6e8f0c26991936ad;p=jquery.git

diff --git a/src/core.js b/src/core.js
index 57a42d0..3763cd0 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;
 	},