- Patch by Steven and me: refactored the form handling of nodes. The node system is now using form_set_error() and friends like the rest of Drupal does. This makes for both a consistent user experience and consistent code. It simplifies the forms and validation code, however, it does change the node API slightly:

    * The _validate hook and the _nodeapi('validate') hook of the node API (1) no longer take an 'error' parameter and (2) should no longer return an error array. To set an error, call form_set_error().

    * The _form hook of the node module no longer takes a form hook and should not worry about displaying errors. Ditto for _nodeapi('form_post') and _nodeapi('form_pre').

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index ac7bba039..4b961c767 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -315,7 +315,7 @@ function profile_admin_add($type) {
       form_set_error('name', t('the specified name is already in use.'));
     }
 
-    if (!form_has_errors()) {
+    if (!form_get_errors()) {
       db_query("INSERT INTO {profile_fields} (title, name, explanation, category, type, weight, required, visibility, options, page) VALUES ('%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', '%s')", $data['title'], $data['name'], $data['explanation'], $data['category'], $type, $data['weight'], $data['required'], $data['visibility'], $data['options'], $data['page']);
 
       drupal_set_message(t('the field has been created.'));
@@ -340,7 +340,7 @@ function profile_admin_edit($fid) {
     // Validate form:
     profile_validate_form($data);
 
-    if (!form_has_errors()) {
+    if (!form_get_errors()) {
       db_query("UPDATE {profile_fields} SET title = '%s', name = '%s', explanation = '%s', category = '%s', weight = %d, required = %d, visibility = %d, options = '%s', page = '%s' WHERE fid = %d", $data['title'], $data['name'], $data['explanation'], $data['category'], $data['weight'], $data['required'], $data['visibility'], $data['options'], $data['page'], $fid);
 
       drupal_set_message(t('the field has been updated.'));