diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-20 09:06:32 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-20 09:06:32 +0000 |
| commit | 668f7c44706e2e05b507c4949e9c06009800f258 (patch) | |
| tree | e4d607d5db3f5ac2b51bad3f702191d4f6a9fdb8 /modules/field_ui/field_ui.admin.inc | |
| parent | b922148c87233ebd4f2411a0efa29d22064cda2b (diff) | |
| download | brdo-668f7c44706e2e05b507c4949e9c06009800f258.tar.gz brdo-668f7c44706e2e05b507c4949e9c06009800f258.tar.bz2 | |
#964092 by Stalski, yched: Fixed Errors when integrating fieldgroup rows on 'Manage fields' screen
Diffstat (limited to 'modules/field_ui/field_ui.admin.inc')
| -rw-r--r-- | modules/field_ui/field_ui.admin.inc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc index dc1479fc7..8c2bfb0ba 100644 --- a/modules/field_ui/field_ui.admin.inc +++ b/modules/field_ui/field_ui.admin.inc @@ -158,15 +158,14 @@ function field_ui_table_pre_render($elements) { // Add row id and associate JS settings. $id = drupal_html_class($name); $row['#attributes']['id'] = $id; - $row += array( - '#js_settings' => array(), - ); - $row['#js_settings'] += array( - 'rowHandler' => $row['#row_type'], - 'name' => $name, - 'region' => $region_name, - ); - $js_settings[$id] = $row['#js_settings']; + if (isset($row['#js_settings'])) { + $row['#js_settings'] += array( + 'rowHandler' => $row['#row_type'], + 'name' => $name, + 'region' => $region_name, + ); + $js_settings[$id] = $row['#js_settings']; + } } } } @@ -304,7 +303,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle ), '#parent_options' => array(), '#regions' => array( - 'main' => array(), + 'main' => array('message' => t('No fields are present yet.')), 'add_new' => array('title' => ' '), ), '#attributes' => array( |