From: John Resig <jeresig@gmail.com>
Date: Mon, 7 Dec 2009 04:20:49 +0000 (-0800)
Subject: Added an extra function check to prevent crashes in Safari 2. Fixes #3039.
X-Git-Tag: 1.4a2~86
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=62a34450c0961e461a72ce4d96f94551ef393b56;p=jquery.git

Added an extra function check to prevent crashes in Safari 2. Fixes #3039.
---

diff --git a/src/core.js b/src/core.js
index b738ce485..c865bfb9a 100644
--- a/src/core.js
+++ b/src/core.js
@@ -417,7 +417,9 @@ jQuery.extend({
 
 		if ( array != null ) {
 			// The window, strings (and functions) also have 'length'
-			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval ) {
+			// The extra typeof function check is to prevent crashes
+			// in Safari 2 (See: #3039)
+			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
 				push.call( ret, array );
 			} else {
 				jQuery.merge( ret, array );