- Patch #39778 by chx: obliterate nodeapi op form in favor of the forms API's way of doing things. Tested with help from webchick.

1 files changed, 7 insertions, 12 deletions

diff --git a/modules/node/node.module b/modules/node/node.module
index 001d700f0..33e1721d0 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1605,9 +1605,16 @@ function node_form($node) {
   $form['created'] = array('#type' => 'value', '#value' => $node->created);
   $form['changed'] = array('#type' => 'value', '#value' => $node->changed);
   $form['type']    = array('#type' => 'value', '#value' => $node->type);
+  $form['#node']   = $node;
 
   // Get the node-specific bits.
   $form = array_merge($form, node_invoke($node, 'form'));
+  if (!isset($form['title']['#weight'])) {
+    $form['title']['#weight'] = -18;
+  }
+  if (!isset($form['body']['#weight'])) {
+    $form['body']['#weight'] = -17;
+  }
 
   // If this is a new node, fill in the default values.
   $node_options = variable_get('node_options_'. $node->type, array('status', 'promote'));
@@ -1651,18 +1658,6 @@ function node_form($node) {
     $form['revision'] = array('#type' => 'value', '#value' => $node->revision);
   }
 
-  $nodeapi = node_invoke_nodeapi($node, 'form');
-  if (is_array($nodeapi)) {
-    foreach ($nodeapi as $key => $element) {
-      $nodeapi[$key]['#weight'] = isset($nodeapi[$key]['#weight']) ? $nodeapi[$key]['#weight'] : -4;
-    }
-    // Append extra node form elements.
-    $form = array_merge($form, $nodeapi);
-  }
-
-  $form['title']['#weight'] = isset($form['title']['#weight']) ? $form['title']['#weight'] : -18;
-  $form['body']['#weight'] = isset($form['body']['#weight']) ? $form['body']['#weight'] : -17;
-
   // Add the buttons.
   $form['preview'] = array('#type' => 'button', '#value' => t('Preview'), '#weight' => 19);