diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-02-01 19:51:13 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-02-01 19:51:13 +0000 |
| commit | f066e7f4e8dcdfb2f47523fa3b67f8d5fde199cd (patch) | |
| tree | f4f585d6cf485b876db33d9eeefcb4cd0b266340 /modules | |
| parent | 67d3310d7c3ca8bc157aa1b4f5b732e3ad6cf856 (diff) | |
| download | brdo-f066e7f4e8dcdfb2f47523fa3b67f8d5fde199cd.tar.gz brdo-f066e7f4e8dcdfb2f47523fa3b67f8d5fde199cd.tar.bz2 | |
- Patch #697880 by nagba, yched: properly initiatlize variable.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/field/field.default.inc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/modules/field/field.default.inc b/modules/field/field.default.inc index 3bd5f10f9..fc21945a5 100644 --- a/modules/field/field.default.inc +++ b/modules/field/field.default.inc @@ -190,28 +190,28 @@ function field_default_view($obj_type, $object, $field, $instance, $langcode, $i $function = $display['module'] . '_field_formatter_view'; if (function_exists($function)) { $elements = $function($obj_type, $object, $field, $instance, $langcode, $items, $display); - } - if ($elements) { - $info = array( - '#theme' => 'field', - '#weight' => $display['weight'], - '#title' => t($instance['label']), - '#access' => field_access('view', $field, $obj_type, $object), - '#label_display' => $display['label'], - '#view_mode' => $view_mode, - '#language' => $langcode, - '#field_name' => $field['field_name'], - '#field_type' => $field['type'], - '#field_translatable' => $field['translatable'], - '#object_type' => $obj_type, - '#bundle' => $bundle, - '#object' => $object, - '#items' => $items, - '#formatter' => $display['type'] - ); - - $addition[$field['field_name']] = array_merge($info, $elements); + if ($elements) { + $info = array( + '#theme' => 'field', + '#weight' => $display['weight'], + '#title' => t($instance['label']), + '#access' => field_access('view', $field, $obj_type, $object), + '#label_display' => $display['label'], + '#view_mode' => $view_mode, + '#language' => $langcode, + '#field_name' => $field['field_name'], + '#field_type' => $field['type'], + '#field_translatable' => $field['translatable'], + '#object_type' => $obj_type, + '#bundle' => $bundle, + '#object' => $object, + '#items' => $items, + '#formatter' => $display['type'] + ); + + $addition[$field['field_name']] = array_merge($info, $elements); + } } } |