X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fjquery%2Fjquery.js;h=6b05a06059f387ea41a45df96bb6cb9bc3b89678;hb=c9511ef948ec3fd58bfd0af8898ef66abdc80255;hp=31dde991d5e41b11f5f1a090444a51d9b05b7f40;hpb=af961d58c244224c14f3bb519214485cb670c64d;p=jquery.git

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 31dde99..6b05a06 100644
--- a/src/jquery/jquery.js
+++ b/src/jquery/jquery.js
@@ -1297,8 +1297,17 @@ jQuery.fn = jQuery.prototype = {
  * @cat Javascript
  */
 jQuery.extend = jQuery.fn.extend = function(obj,prop) {
+	// Watch for the case where null or undefined gets passed in by accident
+	if ( arguments.length > 1 && (prop === null || prop == undefined) )
+		return obj;
+
+	// If no property object was provided, then we're extending jQuery
 	if ( !prop ) { prop = obj; obj = this; }
+
+	// Extend the base object
 	for ( var i in prop ) obj[i] = prop[i];
+
+	// Return the modified object
 	return obj;
 };