summaryrefslogtreecommitdiff
path: root/modules/field_ui
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-08-03 23:01:14 +0000
committerDries Buytaert <dries@buytaert.net>2010-08-03 23:01:14 +0000
commit603d33649b725051391d480446011a5148bb5255 (patch)
tree16f5835a8a865943e62e35ed756ab4719a427132 /modules/field_ui
parentf645ab468a57a9c8d5d5cac70c29dd0315f149d4 (diff)
downloadbrdo-603d33649b725051391d480446011a5148bb5255.tar.gz
brdo-603d33649b725051391d480446011a5148bb5255.tar.bz2
- Patch #870292 by sun, yched: hook_field_extra_fields() results are not cached.
Diffstat (limited to 'modules/field_ui')
-rw-r--r--modules/field_ui/field_ui.admin.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/field_ui/field_ui.admin.inc b/modules/field_ui/field_ui.admin.inc
index 3cf095f13..ed3cec643 100644
--- a/modules/field_ui/field_ui.admin.inc
+++ b/modules/field_ui/field_ui.admin.inc
@@ -182,7 +182,7 @@ function field_ui_field_overview_form($form, &$form_state, $entity_type, $bundle
$field_types = field_info_field_types();
$widget_types = field_info_widget_types();
- $extra_fields = field_extra_fields($entity_type, $bundle, 'form');
+ $extra_fields = field_info_extra_fields($entity_type, $bundle, 'form');
// Store each default weight so that we can add the 'add new' rows after them.
$weights = array();
@@ -709,7 +709,7 @@ function field_ui_display_overview_form($form, &$form_state, $entity_type, $bund
// Gather type information.
$instances = field_info_instances($entity_type, $bundle);
$field_types = field_info_field_types();
- $extra_fields = field_extra_fields($entity_type, $bundle, 'display');
+ $extra_fields = field_info_extra_fields($entity_type, $bundle, 'display');
$form += array(
'#entity_type' => $entity_type,