From: Karen Stevenson
Date: Tue, 15 Mar 2011 19:13:24 +0000 (-0500)
Subject: Issue #1053566 by DamienMcKenna: Fix undefined index errors in _fieldgroup_get_tree().
X-Git-Tag: 6.x-3.0-alpha2~5
X-Git-Url: http://drupalcode.org/project/cck.git/commitdiff_plain/bd76559d8939bacbd99001948bfd6558d2add6cb

Issue #1053566 by DamienMcKenna: Fix undefined index errors in _fieldgroup_get_tree().
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 95193d9..8fd80ab 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,7 +2,14 @@
 CCK 6.x-3.x
 ===========
 
+CCK 6.x-3.0-alpha2
+==================
+
+Features:
+- #536260 by Agileware: Make "Add more values" button text themeable.
 
+Bugfixes:
+- #1053566 by DamienMcKenna: Fix undefined index errors in _fieldgroup_get_tree().
 - #1081072 Must be able to save empty, non-required, multigroup, even if it contains required fields.
 - #522564 Remove empty groups even if not marked 'remove'.
 - Multigroup validation was defaulting to 'required' when created, should default to 'not required'.
diff --git a/modules/fieldgroup/fieldgroup.module b/modules/fieldgroup/fieldgroup.module
index bda6d5e..7fe3fa7 100644
--- a/modules/fieldgroup/fieldgroup.module
+++ b/modules/fieldgroup/fieldgroup.module
@@ -307,7 +307,7 @@ function _fieldgroup_get_tree($type_name, $parent = '', $depth = -1, $max_depth
         $group['depth'] = $depth;
         $group['parents'] = $parents[$type_name][$child_group_name];
         $tree[$group['group_name']] = $group;
-        if ($children[$type_name][$child_group_name]) {
+        if (!empty($children[$type_name][$child_group_name])) {
           $tree = array_merge($tree, _fieldgroup_get_tree($type_name, $child_group_name, $depth, $max_depth));
         }
       }