diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-03-26 13:31:28 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-03-26 13:31:28 +0000 |
| commit | eecab1083a718ccf18e6451df6108803f4d0c1be (patch) | |
| tree | c97f1d2d434aa21fe84c9b202d264d0d7574860c /modules/node | |
| parent | 87f82a61271b6f22eb0de8476e1b32dcbb4755f1 (diff) | |
| download | brdo-eecab1083a718ccf18e6451df6108803f4d0c1be.tar.gz brdo-eecab1083a718ccf18e6451df6108803f4d0c1be.tar.bz2 | |
#369964 by yched and bjaspan: Refactor field validation and error reporting. Field API no longer coupled to Form API. Hooray.
Diffstat (limited to 'modules/node')
| -rw-r--r-- | modules/node/node.module | 3 | ||||
| -rw-r--r-- | modules/node/node.pages.inc | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/modules/node/node.module b/modules/node/node.module index b2b18ae53..62dacd490 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -997,9 +997,6 @@ function node_validate($node, $form = array()) { } } - // Validate fields - field_attach_validate('node', $node, $form); - // Do node-type-specific validation checks. node_invoke($node, 'validate', $form); node_invoke_node($node, 'validate', $form); diff --git a/modules/node/node.pages.inc b/modules/node/node.pages.inc index e0481e0fe..b77c3801c 100644 --- a/modules/node/node.pages.inc +++ b/modules/node/node.pages.inc @@ -68,7 +68,13 @@ function node_add($type) { } function node_form_validate($form, &$form_state) { - node_validate($form_state['values'], $form); + $node = $form_state['values']; + node_validate($node, $form); + + // Field validation. Requires access to $form_state, so this cannot be + // done in node_validate() as it currently exists. + $node = (object)$node; + field_attach_form_validate('node', $node, $form, $form_state); } function node_object_prepare(&$node) { |