? access_4.patch.txt
? files
? formpull_11.patch
? mw.patch
? patch
? tmp.patch
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.833
diff -u -F^f -r1.833 node.module
--- modules/node/node.module	18 Jun 2007 16:09:38 -0000	1.833
+++ modules/node/node.module	20 Jun 2007 20:27:57 -0000
@@ -2151,20 +2151,21 @@ function node_form(&$form_state, $node) 
   }
 
   // Add the buttons.
-  $form['preview'] = array(
+  $form['buttons'] = array();
+  $form['buttons']['preview'] = array(
     '#type' => 'submit',
     '#value' => t('Preview'),
-    '#weight' => 40,
+    '#weight' => 5,
     '#submit' => array('node_form_build_preview'),
   );
-  $form['submit'] = array(
+  $form['buttons']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit'),
-    '#weight' => 45,
+    '#weight' => 10,
     '#submit' => array('node_form_submit'),
   );
   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['#validate'][] = 'node_form_validate';
   $form['#theme'] = 'node_form';
@@ -2199,9 +2200,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.