Index: modules/blog.module =================================================================== RCS file: /cvs/drupal/drupal/modules/blog.module,v retrieving revision 1.222 diff -u -F^f -r1.222 blog.module --- modules/blog.module 31 Jul 2005 08:58:01 -0000 1.222 +++ modules/blog.module 24 Aug 2005 16:28:26 -0000 @@ -204,16 +204,17 @@ function blog_form(&$node) { // Note: $item->description has been validated on aggregation. $node->body = ''. check_plain($item->title) .' - '. $item->description .' ['. check_plain($item->ftitle) ."]\n"; } + } if (function_exists('taxonomy_node_form')) { - $output .= implode('', taxonomy_node_form('blog', $node)); + $form['taxonomy'] = taxonomy_node_form('blog', $node); } - $output .= form_textarea(t('Body'), 'body', $node->body, 60, 20, '', NULL, TRUE); - $output .= filter_form('format', $node->format); + $form['body'] = array(type => 'textarea', title => t('Body'), default_value => $node->body, required => TRUE, weight => 1); + # $form['format'] = filter_form($node->format); - return $output; + return $form; } /** Index: modules/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node.module,v retrieving revision 1.521 diff -u -F^f -r1.521 node.module --- modules/node.module 22 Aug 2005 20:39:43 -0000 1.521 +++ modules/node.module 24 Aug 2005 16:28:27 -0000 @@ -1,6 +1,7 @@ validated) { $edit = node_validate($edit); } + // Set the id of the top-level form tag + $form[attributes]['id'] = 'node-form'; + // Prepend extra node form elements. - $form = implode('', node_invoke_nodeapi($edit, 'form pre')); + $form = array_merge($form, node_invoke_nodeapi($node, 'form pre')); + + /** + * Basic node information. + * These elements set the value property, making them immutable. + */ + $form['uid'] = array(type => 'hidden', value => $node->uid); + $form['created'] = array(type => 'hidden', value => $node->created); + $form['changed'] = array(type => 'hidden', value => $node->changed); + $form['type'] = array(type => 'hidden', value => $node->type); // Get the node-specific bits. // We can't use node_invoke() because $param must be passed by reference. - $function = node_get_module_name($edit) .'_form'; + $function = node_get_module_name($node) .'_form'; $param = array(); if (function_exists($function)) { - $form .= $function($edit, $param); + $form = array_merge($form, $function($node, $param)); } // Append extra node form elements. - $form .= implode('', node_invoke_nodeapi($edit, 'form post')); - - $output .= '