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

2 files changed, 6 insertions, 13 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index b416dd405..56b4dba04 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -478,15 +478,13 @@ function node_configure_fields($type) {
           'full' => array(
             'label' => 'hidden',
             'type' => 'text_default',
-            'exclude' => 0,
-            ),
+          ),
           'teaser' => array(
             'label' => 'hidden',
             'type' => 'text_summary_or_trimmed',
-            'exclude' => 0,
-            ),
           ),
-        );
+        ),
+      );
       field_create_instance($instance);
     }
     else {
@@ -1251,10 +1249,6 @@ function template_preprocess_node(&$variables) {
   // Clean up name so there are no underscores.
   $variables['template_files'][] = 'node-' . str_replace('_', '-', $node->type);
   $variables['template_files'][] = 'node-' . $node->nid;
-
-  // Add $FIELD_NAME_rendered variables for fields.
-  drupal_function_exists('field_attach_preprocess');
-  $variables += field_attach_preprocess('node', $node);
 }
 
 /**
diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index fc4255f43..92238d52d 100644
--- a/modules/node/node.tpl.php
+++ b/modules/node/node.tpl.php
@@ -7,9 +7,9 @@
  *
  * Available variables:
  * - $title: the (sanitized) title of the node.
- * - $content: An array of node items. Use render($content) to print them all, or 
- *   print a subset such as render($content['field_example']). Use 
- *   hide($content['field_example]) to temporarily suppress the printing of a 
+ * - $content: An array of node items. Use render($content) to print them all, or
+ *   print a subset such as render($content['field_example']). Use
+ *   hide($content['field_example]) to temporarily suppress the printing of a
  *   given element.
  * - $comments: the themed list of comments (if any).
  * - $picture: The authors picture of the node output from
@@ -36,7 +36,6 @@
  *   - node-promoted: Nodes promoted to the front page.
  *   - node-sticky: Nodes ordered above other non-sticky nodes in teaser listings.
  *   - node-unpublished: Unpublished nodes visible only to administrators.
- * TODO D7 : document $FIELD_NAME_rendered variables.
  *
  * Other variables:
  * - $node: Full node object. Contains data that may not be safe.