From: John Resig <jeresig@gmail.com>
Date: Sun, 15 Oct 2006 03:11:02 +0000 (+0000)
Subject: Added fix for jQuery.extend( Object, null || undefined ) lapsing back to just jQuery... 
X-Git-Tag: 1.0.3~23
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c9511ef948ec3fd58bfd0af8898ef66abdc80255;p=jquery.git

Added fix for jQuery.extend( Object, null || undefined ) lapsing back to just jQuery.extend( Object ).
---

diff --git a/src/jquery/jquery.js b/src/jquery/jquery.js
index 31dde991d..6b05a0605 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;
 };