diff options
| author | paulsohier <paul999@phpbb.com> | 2015-01-24 19:04:26 +0100 |
|---|---|---|
| committer | paulsohier <paul999@phpbb.com> | 2015-01-24 19:04:26 +0100 |
| commit | c86e5e8514055ade4cdf17d63feaf450d1e8bd69 (patch) | |
| tree | af5efa3803ef6a9cb9eac030815d3aae82ebf6ff /phpBB/includes | |
| parent | b0383a90e1416d14fd5461b4d148386f3cdb4ac4 (diff) | |
| download | forums-c86e5e8514055ade4cdf17d63feaf450d1e8bd69.tar forums-c86e5e8514055ade4cdf17d63feaf450d1e8bd69.tar.gz forums-c86e5e8514055ade4cdf17d63feaf450d1e8bd69.tar.bz2 forums-c86e5e8514055ade4cdf17d63feaf450d1e8bd69.tar.xz forums-c86e5e8514055ade4cdf17d63feaf450d1e8bd69.zip | |
[ticket/13542] Merge result of validation into existing $error
Because extensions can set a entry in $error, the result of the validate
needs to be merged into it.
PHPBB3-13542
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 111e16685a..6a990e2e0f 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -85,11 +85,11 @@ class ucp_prefs $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), 'lang' => array('language_iso_name'), 'tz' => array('timezone'), - )); + )), $error); if (!check_form_key('ucp_prefs_personal')) { |