#361683 follow-up by sun: Remove more windows line endings.

includes/theme.inc

@@ -2006,10 +2006,10 @@ 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['template_files'][] = 'node-' . $node->nid;
+
+  // Add $FIELD_NAME_rendered variables for fields.
+  drupal_function_exists('field_attach_preprocess');
   $variables += field_attach_preprocess('node', $node);
 }
 

modules/field/modules/list/list.info

@@ -3,5 +3,4 @@ name = List
 description = Defines list field types. Use with Options to create selection lists.
 package = Core - fields
 core = 7.x
-
 files[]=list.module

modules/field/modules/number/number.info

@@ -3,5 +3,4 @@ name = Number
 description = Defines numeric field types.
 package = Core - fields
 core = 7.x
-
 files[]=number.module

modules/field/modules/text/text.info

@@ -3,5 +3,4 @@ name = Text
 description = Defines simple text field types.
 package = Core - fields
 core = 7.x
-
 files[]=text.module

modules/field/sample_code.php

-<?php
-
-$field = array(
-  'field_name' => 'field_single',
-  'type' => 'text',
-);
-field_create_field($field);
-
-$instance = array(
-  'field_name' => 'field_single',
-  'bundle' => 'article',
-  'label' => 'Single',
-  'widget' => array(
-    'type' => 'text_textfield',
-  ),
-  'display' => array(
-    'full' => array(
-      'label' => 'above',
-      'type' => 'text_default',
-      'exclude' => 0,
-    ),
-  ),
-);
-field_create_instance($instance);
-
-$instance['bundle'] = 'user';
-field_create_instance($instance);
-
-
-$field = array(
-  'field_name' => 'field_multiple',
-  'cardinality' => FIELD_CARDINALITY_UNLIMITED,
-  'type' => 'text',
-);
-field_create_field($field);
-
-$instance = array(
-  'field_name' => 'field_multiple',
-  'bundle' => 'article',
-  'label' => 'Multiple',
-  'widget' => array(
-    'type' => 'text_textfield',
-  ),
-  'display' => array(
-    'full' => array(
-      'label' => 'above',
-      'type' => 'text_default',
-      'exclude' => 0,
-    ),
-  ),
-);
-field_create_instance($instance);
-
-$instance['bundle'] = 'user';
-field_create_instance($instance);
-
-
-// Number
-$field = array(
-  'field_name' => 'field_integer',
-  'type' => 'number_integer',
-);
-field_create_field($field);
-$instance = array(
-  'field_name' => 'field_integer',
-  'bundle' => 'article',
-  'label' => 'Integer',
-  'widget' => array(
-    'type' => 'number',
-  ),
-  'display' => array(
-    'full' => array(
-      'label' => 'above',
-      'type' => 'number_integer',
-      'exclude' => 0,
-    ),
-  ),
-);
-field_create_instance($instance);
-
-$field = array(
-  'field_name' => 'field_decimal',
-  'type' => 'number_decimal',
-);
-field_create_field($field);
-$instance = array(
-  'field_name' => 'field_decimal',
-  'bundle' => 'article',
-  'label' => 'Decimal',
-  'widget' => array(
-    'type' => 'number',
-  ),
-  'display' => array(
-    'full' => array(
-      'label' => 'above',
-      'type' => 'number_decimal',
-      'exclude' => 0,
-    ),
-  ),
-);
-field_create_instance($instance);
-
-
+<?php
+
+$field = array(
+  'field_name' => 'field_single',
+  'type' => 'text',
+);
+field_create_field($field);
+
+$instance = array(
+  'field_name' => 'field_single',
+  'bundle' => 'article',
+  'label' => 'Single',
+  'widget' => array(
+    'type' => 'text_textfield',
+  ),
+  'display' => array(
+    'full' => array(
+      'label' => 'above',
+      'type' => 'text_default',
+      'exclude' => 0,
+    ),
+  ),
+);
+field_create_instance($instance);
+
+$instance['bundle'] = 'user';
+field_create_instance($instance);
+
+
+$field = array(
+  'field_name' => 'field_multiple',
+  'cardinality' => FIELD_CARDINALITY_UNLIMITED,
+  'type' => 'text',
+);
+field_create_field($field);
+
+$instance = array(
+  'field_name' => 'field_multiple',
+  'bundle' => 'article',
+  'label' => 'Multiple',
+  'widget' => array(
+    'type' => 'text_textfield',
+  ),
+  'display' => array(
+    'full' => array(
+      'label' => 'above',
+      'type' => 'text_default',
+      'exclude' => 0,
+    ),
+  ),
+);
+field_create_instance($instance);
+
+$instance['bundle'] = 'user';
+field_create_instance($instance);
+
+
+// Number
+$field = array(
+  'field_name' => 'field_integer',
+  'type' => 'number_integer',
+);
+field_create_field($field);
+$instance = array(
+  'field_name' => 'field_integer',
+  'bundle' => 'article',
+  'label' => 'Integer',
+  'widget' => array(
+    'type' => 'number',
+  ),
+  'display' => array(
+    'full' => array(
+      'label' => 'above',
+      'type' => 'number_integer',
+      'exclude' => 0,
+    ),
+  ),
+);
+field_create_instance($instance);
+
+$field = array(
+  'field_name' => 'field_decimal',
+  'type' => 'number_decimal',
+);
+field_create_field($field);
+$instance = array(
+  'field_name' => 'field_decimal',
+  'bundle' => 'article',
+  'label' => 'Decimal',
+  'widget' => array(
+    'type' => 'number',
+  ),
+  'display' => array(
+    'full' => array(
+      'label' => 'above',
+      'type' => 'number_decimal',
+      'exclude' => 0,
+    ),
+  ),
+);
+field_create_instance($instance);
+
+

modules/field/theme/field.css

+/* $Id$ */
+
 /* Node display */
 .field .field-label,
 .field .field-label-inline,
@@ -27,4 +29,4 @@
 .node-form .number {
   display:inline;
   width:auto;
-}
\ No newline at end of file
+}

modules/node/node.tpl.php

@@ -20,7 +20,7 @@
  * - $terms: the themed list of taxonomy term links output from theme_links().
  * - $submitted: themed submission information output from
  *   theme_node_submitted().
- * TODO D7 : document $FIELD_NAME_rendered variables.
+ * TODO D7 : document $FIELD_NAME_rendered variables.
  *
  * Other variables:
  * - $node: Full node object. Contains data that may not be safe.