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

[ticket/13542] Merge result of validation into existing $error

Browse source 
Because extensions can set a entry in $error, the result of the validate
needs to be merged into it.

PHPBB3-13542
This commit is contained in:
paulsohier 2015-01-24 19:04:26 +01:00
parent b0383a90e1
commit c86e5e8514
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,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'))
{ {