diff options
author | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-04-23 05:22:05 +0000 |
---|---|---|
committer | Neil Drumm <drumm@3064.no-reply.drupal.org> | 2006-04-23 05:22:05 +0000 |
commit | 7961f6813728fb18d7900ae1bbf5f0a33c281779 (patch) | |
tree | b1b1971e03643430747c3ec94b26781b19e57aa2 | |
parent | 47fba524608a770cfe016d7efe853dcc86703c6b (diff) | |
download | brdo-7961f6813728fb18d7900ae1bbf5f0a33c281779.tar.gz brdo-7961f6813728fb18d7900ae1bbf5f0a33c281779.tar.bz2 |
#59935 by chx, make nodeapi consistent with the rest of formapi, enabling the use of form_set_value.
-rw-r--r-- | modules/node.module | 10 | ||||
-rw-r--r-- | modules/node/node.module | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/modules/node.module b/modules/node.module index 34f2c3054..5be1c0289 100644 --- a/modules/node.module +++ b/modules/node.module @@ -1520,7 +1520,7 @@ function node_submit($node) { /** * Perform validation checks on the given node. */ -function node_validate($node) { +function node_validate($node, $form = array()) { // Convert the node to an object, if necessary. $node = (object)$node; @@ -1550,12 +1550,12 @@ function node_validate($node) { } // Do node-type-specific validation checks. - node_invoke($node, 'validate'); - node_invoke_nodeapi($node, 'validate'); + node_invoke($node, 'validate', $form); + node_invoke_nodeapi($node, 'validate', $form); } -function node_form_validate($form_id, $edit) { - node_validate($edit); +function node_form_validate($form_id, $form_values, $form) { + node_validate($form_values, $form); } function node_object_prepare(&$node) { diff --git a/modules/node/node.module b/modules/node/node.module index 34f2c3054..5be1c0289 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1520,7 +1520,7 @@ function node_submit($node) { /** * Perform validation checks on the given node. */ -function node_validate($node) { +function node_validate($node, $form = array()) { // Convert the node to an object, if necessary. $node = (object)$node; @@ -1550,12 +1550,12 @@ function node_validate($node) { } // Do node-type-specific validation checks. - node_invoke($node, 'validate'); - node_invoke_nodeapi($node, 'validate'); + node_invoke($node, 'validate', $form); + node_invoke_nodeapi($node, 'validate', $form); } -function node_form_validate($form_id, $edit) { - node_validate($edit); +function node_form_validate($form_id, $form_values, $form) { + node_validate($form_values, $form); } function node_object_prepare(&$node) { |