Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #697880 by nagba, yched: properly initiatlize variable.

merge-requests/26/head
Dries Buytaert 2010-02-01 19:51:13 +00:00
parent 67d3310d7c
commit f066e7f4e8
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
modules/field/field.default.inc
View File

@ -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']
);
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);
$addition[$field['field_name']] = array_merge($info, $elements);
}
}
}