summaryrefslogtreecommitdiff
path: root/modules/field/field.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-10-15 12:44:36 +0000
committerDries Buytaert <dries@buytaert.net>2009-10-15 12:44:36 +0000
commit714597a9cdb42c3ca0df843f7f6a7351c6e06e39 (patch)
tree4e42239768111673ec7e8ae3181e7fa7339937c4 /modules/field/field.module
parent35e21e54e1122f98bede28f89d80f2fb13b3fd97 (diff)
downloadbrdo-714597a9cdb42c3ca0df843f7f6a7351c6e06e39.tar.gz
brdo-714597a9cdb42c3ca0df843f7f6a7351c6e06e39.tar.bz2
- Patch #470242 by yched, bjaspan: fixed namespacing for bundle names to avoid users rendering their site unusable.
Diffstat (limited to 'modules/field/field.module')
-rw-r--r--modules/field/field.module5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/field/field.module b/modules/field/field.module
index 0a14e084d..edc20c243 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -507,7 +507,7 @@ function field_format($obj_type, $object, $field, $item, $formatter_type = NULL,
// We need $field, $instance, $obj_type, $object to be able to display a value...
list(, , $bundle) = field_extract_ids($obj_type, $object);
- $instance = field_info_instance($field['field_name'], $bundle);
+ $instance = field_info_instance($obj_type, $field['field_name'], $bundle);
$display = array(
'type' => $formatter_type ? $formatter_type : $field_type['default_formatter'],
@@ -521,6 +521,7 @@ function field_format($obj_type, $object, $field, $item, $formatter_type = NULL,
$element = array(
'#theme' => $theme,
'#field_name' => $field['field_name'],
+ '#object_type' => $obj_type,
'#bundle' => $bundle,
'#formatter' => $display['type'],
'#settings' => $display['settings'],
@@ -741,7 +742,7 @@ function field_create_stub_entity($obj_type, $ids) {
function template_preprocess_field(&$variables) {
$element = $variables['element'];
list(, , $bundle) = field_extract_ids($element['#object_type'], $element['#object']);
- $instance = field_info_instance($element['#field_name'], $bundle);
+ $instance = field_info_instance($element['#object_type'], $element['#field_name'], $bundle);
$field = field_info_field($element['#field_name']);
$field_type_css = strtr($field['type'], '_', '-');