diff options
Diffstat (limited to 'modules/user.module')
| -rw-r--r-- | modules/user.module | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/modules/user.module b/modules/user.module index 13cb6c7a6..01ba43601 100644 --- a/modules/user.module +++ b/modules/user.module @@ -1512,19 +1512,6 @@ function user_admin_edit($edit = array()) { if ($account = user_load(array('uid' => $id))) { if ($op == t("Save account")) { - foreach (module_list() as $module) { - if (module_hook($module, 'user')) { - $result = module_invoke($module, 'user', 'validate', $edit, $account); - } - if (is_array($result)) { - $data = array_merge($data, $result); - } - elseif (is_string($result)) { - $error = $result; - break; - } - } - // TODO: this display/edit/validate should be moved to a new profile module implementing the _user hooks if ($error = user_validate_name($edit['name'])) { // do nothing @@ -1540,6 +1527,23 @@ function user_admin_edit($edit = array()) { } /* + ** Validate fields added by other modules. + */ + + foreach (module_list() as $module) { + if (module_hook($module, 'user')) { + $result = module_invoke($module, 'user', 'validate', $edit, $account); + } + if (is_array($result)) { + $data = array_merge($data, $result); + } + elseif (is_string($result)) { + $error = $result; + break; + } + } + + /* ** If required, validate the picture. */ |