From 5ded499ddaa5881b0e43eeecbd8c0dbe7a832552 Mon Sep 17 00:00:00 2001 From: heddn Date: Wed, 11 Sep 2013 15:26:32 -0500 Subject: Issue #1596304 by heddn, hadsie: Notice: Uninitialized string offset: 0 in field_group_unpack() --- field_group.module | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/field_group.module b/field_group.module index f2f9468..7394e28 100644 --- a/field_group.module +++ b/field_group.module @@ -1671,21 +1671,25 @@ function field_group_exists($group_name, $entity_type, $bundle, $mode) { * Field group object. */ function field_group_unpack($packed_group) { - if (!isset($packed_group->data)) { - return $packed_group; - } - - // Extract unserialized data. $group = clone $packed_group; - $data = $group->data; + + // Extract unserialized data. + if (!empty($group->data)) { + $data = $group->data; + $group->label = $data['label']; + $group->weight = $data['weight']; + $group->children = $data['children']; + $group->format_type = !empty($data['format_type']) ? $data['format_type'] : 'fieldset'; + if (isset($data['format_settings'])) { + $group->format_settings = $data['format_settings']; + } + } + else { + $group->label = $group->weight = NULL; + $group->children = array(); + $group->format_type = 'fieldset'; + } unset($group->data); - $group->label = isset($data['label']) ? $data['label'] : ''; - $group->weight = isset($data['weight']) ? $data['weight'] : ''; - $group->children = isset($data['children']) ? $data['children'] : ''; - $group->format_type = !empty($data['format_type']) ? $data['format_type'] : 'fieldset'; - if (isset($data['format_settings'])) { - $group->format_settings = $data['format_settings']; - } return $group; } -- 1.7.10.4