- Patch #545662 by yched, moshe weitzman: simplify field rendering.

1 files changed, 5 insertions, 2 deletions

diff --git a/modules/field/field.attach.inc b/modules/field/field.attach.inc
index f5f5de5b0..3061105c2 100644
--- a/modules/field/field.attach.inc
+++ b/modules/field/field.attach.inc
@@ -490,6 +490,7 @@ function field_attach_form($obj_type, $object, &$form, &$form_state, $langcode =
 
   // Add custom weight handling.
   list($id, $vid, $bundle) = field_attach_extract_ids($obj_type, $object);
+  $form['#attached_css'][] = drupal_get_path('module', 'field') . '/theme/field.css';
   $form['#pre_render'][] = '_field_extra_weights_pre_render';
   $form['#extra_fields'] = field_extra_fields($bundle);
 
@@ -1040,10 +1041,11 @@ function field_attach_query_revisions($field_id, $conditions, $count, &$cursor =
  *       '#label_display' => the label display mode,
  *       '#object' => the fieldable object being displayed,
  *       '#object_type' => the type of the object being displayed,
+ *       '#language' => the language of the field values being displayed,
  *       '#build_mode' => the build mode,
  *       '#field_name' => the name of the field,
- *       '#single' => boolean indicating whether the formatter is single or
- *         multiple,
+ *       '#formatter_single' => boolean indicating whether the formatter is single or
+ *          multiple,
  *       'items' => array(
  *         // One sub-array per field value, keyed by delta.
  *         0 => array(
@@ -1088,6 +1090,7 @@ function field_attach_view($obj_type, $object, $build_mode = 'full', $langcode =
 
   // Add custom weight handling.
   list($id, $vid, $bundle) = field_attach_extract_ids($obj_type, $object);
+  $output['#attached_css'][] = drupal_get_path('module', 'field') . '/theme/field.css';
   $output['#pre_render'][] = '_field_extra_weights_pre_render';
   $output['#extra_fields'] = field_extra_fields($bundle);