Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#335741 by electricmonk. Do not recurse over non-objects.

5.x
Neil Drumm 2009-02-26 06:46:48 +00:00
parent d33a7a8fc5
commit b7715b93ff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/drupal.js
View File

@ -12,8 +12,8 @@ Drupal.jsEnabled = document.getElementsByTagName && document.createElement && do
*/ */
Drupal.extend = function(obj) { Drupal.extend = function(obj) {
for (var i in obj) { for (var i in obj) {
if (this[i]) { if (this[i] && (typeof(this[i]) == 'function' || typeof(this[i]) == 'object')) {
Drupal.extend.apply(this[i], [obj[i]]); Drupal.extend.apply(this[i], [obj[i]]);
} }
else { else {
this[i] = obj[i]; this[i] = obj[i];