Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.32
diff -u -p -r1.32 node.pages.inc
--- modules/node/node.pages.inc	14 Aug 2008 13:47:35 -0000	1.32
+++ modules/node/node.pages.inc	18 Aug 2008 20:33:44 -0000
@@ -176,7 +176,7 @@ function node_form(&$form_state, $node) 
     '#title' => t('Authoring information'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#weight' => 20,
+    '#weight' => 90,
   );
   $form['author']['name'] = array(
     '#type' => 'textfield',
@@ -205,7 +205,7 @@ function node_form(&$form_state, $node) 
     '#title' => t('Publishing options'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#weight' => 25,
+    '#weight' => 95,
   );
   $form['options']['status'] = array(
     '#type' => 'checkbox',
@@ -233,6 +233,7 @@ function node_form(&$form_state, $node) 
 
   // Add the buttons.
   $form['buttons'] = array();
+  $form['buttons']['#weight'] = 100;
   $form['buttons']['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
@@ -328,34 +329,10 @@ function node_form_build_preview($form, 
 function theme_node_form($form) {
   $output = "\n<div class=\"node-form\">\n";
 
-  // Admin form fields and submit buttons must be rendered first, because
-  // they need to go to the bottom of the form, and so should not be part of
-  // the catch-all call to drupal_render().
-  $admin = '';
-  if (isset($form['author'])) {
-    $admin .= "    <div class=\"authored\">\n";
-    $admin .= drupal_render($form['author']);
-    $admin .= "    </div>\n";
-  }
-  if (isset($form['options'])) {
-    $admin .= "    <div class=\"options\">\n";
-    $admin .= drupal_render($form['options']);
-    $admin .= "    </div>\n";
-  }
-  $buttons = drupal_render($form['buttons']);
-
-  // Everything else gets rendered here, and is displayed before the admin form
-  // field and the submit buttons.
   $output .= "  <div class=\"standard\">\n";
   $output .= drupal_render($form);
   $output .= "  </div>\n";
 
-  if (!empty($admin)) {
-    $output .= "  <div class=\"admin\">\n";
-    $output .= $admin;
-    $output .= "  </div>\n";
-  }
-  $output .= $buttons;
   $output .= "</div>\n";
 
   return $output;