makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.1.x'

Browse source
This commit is contained in:
Marc Alexander 2015-03-10 15:20:28 +01:00
commit 6f3ca35ae7
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/includes/ucp/ucp_profile.php
View file

@ -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'];