diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-03-10 15:20:28 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-03-10 15:20:28 +0100 |
| commit | 6f3ca35ae7c2644514f60bd455189ae012b41560 (patch) | |
| tree | 2b0ba26725e6e9a61d0e7849aaf52ca94147cdd4 /phpBB/includes/ucp/ucp_profile.php | |
| parent | 3a4e1ce2152a7a4e9bfb91b9c73517744ebf817f (diff) | |
| parent | 3cb1907e76cc760f455f4571011bc4c517eb56db (diff) | |
| download | forums-6f3ca35ae7c2644514f60bd455189ae012b41560.tar forums-6f3ca35ae7c2644514f60bd455189ae012b41560.tar.gz forums-6f3ca35ae7c2644514f60bd455189ae012b41560.tar.bz2 forums-6f3ca35ae7c2644514f60bd455189ae012b41560.tar.xz forums-6f3ca35ae7c2644514f60bd455189ae012b41560.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 8adb96b6ab..66eae22a1b 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -115,16 +115,16 @@ class ucp_profile } /** - * Validate user data on editing profile in UCP + * Validate user data on editing registration data in UCP * - * @event core.ucp_profile_info_validate_data + * @event core.ucp_profile_reg_details_validate * @var array data Array with user profile data * @var bool submit Flag indicating if submit button has been pressed * @var array error Array of any generated errors * @since 3.1.4-RC1 */ $vars = array('data', 'submit', 'error'); - extract($phpbb_dispatcher->trigger_event('core.ucp_profile_info_validate_data', compact($vars))); + extract($phpbb_dispatcher->trigger_event('core.ucp_profile_reg_details_validate', compact($vars))); if (!sizeof($error)) { @@ -378,6 +378,18 @@ class ucp_profile $error[] = 'FORM_INVALID'; } + /** + * Validate user data on editing profile in UCP + * + * @event core.ucp_profile_validate_profile_info + * @var array data Array with user profile data + * @var bool submit Flag indicating if submit button has been pressed + * @var array error Array of any generated errors + * @since 3.1.4-RC1 + */ + $vars = array('data', 'submit', 'error'); + extract($phpbb_dispatcher->trigger_event('core.ucp_profile_validate_profile_info', compact($vars))); + if (!sizeof($error)) { $data['notify'] = $user->data['user_notify_type']; |