1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 14:35:56 +02:00

Merge branch '3.1.x'

This commit is contained in:
Joas Schilling 2015-02-24 21:53:05 +01:00
commit 06d6bcbe00

View File

@ -114,6 +114,18 @@ class ucp_profile
$error[] = 'FORM_INVALID';
}
/**
* Validate user data on editing profile in UCP
*
* @event core.ucp_profile_info_validate_data
* @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)));
if (!sizeof($error))
{
$sql_ary = array(
@ -393,7 +405,7 @@ class ucp_profile
* @event core.ucp_profile_info_modify_sql_ary
* @var array cp_data Array with the user custom profile fields data
* @var array data Array with user profile data
* @var array sql_ary user options data we update
* @var array sql_ary user options data we update
* @since 3.1.4-RC1
*/
$vars = array('cp_data', 'data', 'sql_ary');