2 files changed, 9 insertions, 9 deletions
diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc
index 03866ec8b..cb5a70d84 100644
--- a/modules/node/node.pages.inc
+++ b/modules/node/node.pages.inc
@@ -257,10 +257,10 @@ function node_form(&$form_state, $node) {
     );
   }
   $form['#validate'][] = 'node_form_validate';
-  $form['#theme'] = array($node->type . '_node_form', 'node_form');
-
-  $form['#builder_function'] = 'node_form_submit_build_node';
-  field_attach_form('node', $node, $form, $form_state);
+  $form['#theme'] = array($node->type . '_node_form', 'node_form');
+
+  $form['#builder_function'] = 'node_form_submit_build_node';
+  field_attach_form('node', $node, $form, $form_state);
 
   return $form;
 }
@@ -468,10 +468,10 @@ function node_form_submit_build_node($form, &$form_state) {
   // Unset any button-level handlers, execute all the form-level submit
   // functions to process the form values into an updated node.
   unset($form_state['submit_handlers']);
-  form_execute_handlers('submit', $form, $form_state);
-  $node = node_submit($form_state['values']);
-
-  field_attach_submit('node', $node, $form, $form_state);
+  form_execute_handlers('submit', $form, $form_state);
+  $node = node_submit($form_state['values']);
+
+  field_attach_submit('node', $node, $form, $form_state);
 
   $form_state['node'] = (array)$node;
   $form_state['rebuild'] = TRUE;
diff --git a/modules/node/node.tpl.php b/modules/node/node.tpl.php
index 3e950f11d..a5bda033a 100644
--- a/modules/node/node.tpl.php
+++ b/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.