- Patch #367215 by yched, sun et al: remove 'exclude from ' display setting. Feel good moment!

1 files changed, 1 insertions, 10 deletions

diff --git a/modules/field/field.module b/modules/field/field.module
index ef1fb1e5d..6b5d184cd 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -169,13 +169,6 @@ function field_theme() {
       'arguments' => array('element' => NULL),
       'path' => $path,
     ),
-    // TODO D7 : do we need exclude in core? See [#367215].
-    // This is just adding '#post_render' => array('field_wrapper_post_render')
-    // at the right places in the render array generated by field_default_view().
-    // Can be done in hook_field_attach_post_view if we want.
-    'field_exclude' => array(
-      'arguments' => array('content' => NULL, 'object' => array(), 'context' => NULL),
-    ),
     'field_multiple_value_form' => array(
       'arguments' => array('element' => NULL),
     ),
@@ -511,9 +504,7 @@ function field_view_field($obj_type, $object, $field, $instance, $build_mode = '
     $view = field_default_view($obj_type, $object, $field, $instance, $items, $build_mode);
     // TODO : what about hook_field_attach_view ?
 
-    // field_default_view() adds a wrapper to handle variables and 'excluded'
-    // fields for node templates. We bypass it and return the actual field.
-    $output = $view[$field['field_name']]['field'];
+    $output = $view[$field['field_name']];
   }
   return $output;
 }