diff options
Diffstat (limited to 'modules/field/field.default.inc')
| -rw-r--r-- | modules/field/field.default.inc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/modules/field/field.default.inc b/modules/field/field.default.inc index f078d24ca..a10d1387f 100644 --- a/modules/field/field.default.inc +++ b/modules/field/field.default.inc @@ -1,5 +1,4 @@ <?php -// $Id$ /** * @file @@ -82,7 +81,7 @@ function field_default_validate($entity_type, $entity, $field, $instance, $langc if ($field['cardinality'] != FIELD_CARDINALITY_UNLIMITED && count($items) > $field['cardinality']) { $errors[$field['field_name']][$langcode][0][] = array( 'error' => 'field_cardinality', - 'message' => t('%name: this field cannot hold more than @count values.', array('%name' => t($instance['label']), '@count' => $field['cardinality'])), + 'message' => t('%name: this field cannot hold more than @count values.', array('%name' => $instance['label'], '@count' => $field['cardinality'])), ); } } @@ -135,21 +134,25 @@ function field_default_insert($entity_type, $entity, $field, $instance, $langcod * - the name of a view mode * - or an array of display settings to use for display, as found in the * 'display' entry of $instance definitions. -*/ + */ function field_default_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $display) { // Group entities, instances and items by formatter module. $modules = array(); foreach ($instances as $id => $instance) { if (is_string($display)) { $view_mode = $display; - $display = field_get_display($instance, $view_mode, $entities[$id]); + $instance_display = field_get_display($instance, $view_mode, $entities[$id]); + } + else { + $instance_display = $display; } - if ($display['type'] !== 'hidden') { - $module = $display['module']; + + if ($instance_display['type'] !== 'hidden') { + $module = $instance_display['module']; $modules[$module] = $module; $grouped_entities[$module][$id] = $entities[$id]; $grouped_instances[$module][$id] = $instance; - $grouped_displays[$module][$id] = $display; + $grouped_displays[$module][$id] = $instance_display; // hook_field_formatter_prepare_view() alters $items by reference. $grouped_items[$module][$id] = &$items[$id]; } @@ -211,7 +214,7 @@ function field_default_view($entity_type, $entity, $field, $instance, $langcode, $info = array( '#theme' => 'field', '#weight' => $display['weight'], - '#title' => t($instance['label']), + '#title' => $instance['label'], '#access' => field_access('view', $field, $entity_type, $entity), '#label_display' => $display['label'], '#view_mode' => $view_mode, |