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

Merge pull request #3334 from paul999/ticket/13542

Browse source 
[ticket/13542] Update core.ucp_prefs_personal_data to include $error
This commit is contained in:
Marc Alexander 2015-02-02 21:05:44 +01:00
commit 5182d02da5
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/ucp/ucp_prefs.php
View file

@ -67,9 +67,11 @@ class ucp_prefs
* @var bool submit Do we display the form only * @var bool submit Do we display the form only
* or did the user press submit * or did the user press submit
* @var array data Array with current ucp options data * @var array data Array with current ucp options data
* @var array error Array with list of errors
* @since 3.1.0-a1 * @since 3.1.0-a1
* @changed 3.1.4-rc1 Added error variable to the event
*/ */
$vars = array('submit', 'data'); $vars = array('submit', 'data', 'error');
extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_personal_data', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.ucp_prefs_personal_data', compact($vars)));
if ($submit) if ($submit)
@ -83,11 +85,11 @@ class ucp_prefs
$data['user_style'] = (int) $user->data['user_style']; $data['user_style'] = (int) $user->data['user_style'];
} }
$error = validate_data($data, array( $error = array_merge(validate_data($data, array(
'dateformat' => array('string', false, 1, 30), 'dateformat' => array('string', false, 1, 30),
'lang' => array('language_iso_name'), 'lang' => array('language_iso_name'),
'tz' => array('timezone'), 'tz' => array('timezone'),
)); )), $error);
if (!check_form_key('ucp_prefs_personal')) if (!check_form_key('ucp_prefs_personal'))
{ {