diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-21 07:28:39 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-21 07:28:39 +0000 |
| commit | 496f568da9f72c63af99b4962a11e7cffff863f6 (patch) | |
| tree | 9272516f16e87dfddfd116b4df3f47444b32e540 /modules/field_ui | |
| parent | d7f60066595aae432d43849e21ae569016942c5a (diff) | |
| download | brdo-496f568da9f72c63af99b4962a11e7cffff863f6.tar.gz brdo-496f568da9f72c63af99b4962a11e7cffff863f6.tar.bz2 | |
#686938 by yched: Fix notice Undefined index: admin in _field_ui_bundle_admin_path()
Diffstat (limited to 'modules/field_ui')
| -rw-r--r-- | modules/field_ui/field_ui.admin.inc | 4 | ||||
| -rw-r--r-- | modules/field_ui/field_ui.module | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc index 72fb6aab4..9d36400e0 100644 --- a/modules/field_ui/field_ui.admin.inc +++ b/modules/field_ui/field_ui.admin.inc @@ -21,8 +21,8 @@ function field_ui_fields_list() { $field = field_info_field($field_name); $admin_path = _field_ui_bundle_admin_path($entity_type, $bundle); $rows[$field_name]['data'][0] = $field['locked'] ? t('@field_name (Locked)', array('@field_name' => $field_name)) : $field_name; - $rows[$field_name]['data'][1] = t($field_types[$field['type']]['label']); - $rows[$field_name]['data'][2][] = l($bundles[$entity_type][$bundle]['label'], $admin_path . '/fields'); + $rows[$field_name]['data'][1] = $field_types[$field['type']]['label']; + $rows[$field_name]['data'][2][] = $admin_path ? l($bundles[$entity_type][$bundle]['label'], $admin_path . '/fields') : $bundles[$entity_type][$bundle]['label']; $rows[$field_name]['class'] = $field['locked'] ? array('menu-disabled') : array(''); } } diff --git a/modules/field_ui/field_ui.module b/modules/field_ui/field_ui.module index cb4831f42..3d2ddf689 100644 --- a/modules/field_ui/field_ui.module +++ b/modules/field_ui/field_ui.module @@ -308,7 +308,9 @@ function field_ui_field_attach_create_bundle($entity_type, $bundle) { function _field_ui_bundle_admin_path($entity_type, $bundle_name) { $bundles = field_info_bundles($entity_type); $bundle_info = $bundles[$bundle_name]; - return isset($bundle_info['admin']['real path']) ? $bundle_info['admin']['real path'] : $bundle_info['admin']['path']; + if (isset($bundle_info['admin'])) { + return isset($bundle_info['admin']['real path']) ? $bundle_info['admin']['real path'] : $bundle_info['admin']['path']; + } } /** |