Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.800
diff -u -p -r1.800 node.module
--- modules/node/node.module	10 Apr 2007 12:11:42 -0000	1.800
+++ modules/node/node.module	18 Apr 2007 19:57:56 -0000
@@ -2088,10 +2088,11 @@ function node_form($node, $form_values =
   }
 
   // Add the buttons.
-  $form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 40);
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Submit'), '#weight' => 45);
+  $form['buttons'] = array();
+  $form['buttons']['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 5);
+  $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Submit'), '#weight' => 10);
   if (!empty($node->nid) && node_access('delete', $node)) {
-    $form['delete'] = array('#type' => 'button', '#value' => t('Delete'), '#weight' => 50);
+    $form['buttons']['delete'] = array('#type' => 'button', '#value' => t('Delete'), '#weight' => 15);
   }
   $form['#after_build'] = array('node_form_add_preview');
   $form['#submit']['node_form_submit'] = array();
@@ -2147,9 +2148,7 @@ function theme_node_form($form) {
     $admin .= drupal_render($form['options']);
     $admin .= "    </div>\n";
   }
-  $buttons = drupal_render($form['preview']);
-  $buttons .= drupal_render($form['submit']);
-  $buttons .= isset($form['delete']) ? drupal_render($form['delete']) : '';
+  $buttons = drupal_render($form['buttons']);
 
   // Everything else gets rendered here, and is displayed before the admin form
   // field and the submit buttons.