diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-12-11 21:02:37 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-12-11 21:02:37 +0100 |
| commit | 2f47c99432c604a2adaad73821602a4b1763caa8 (patch) | |
| tree | 3fc6247d2203b73861511ef1690346cf467a80be /phpBB/includes/avatar/driver | |
| parent | 1aae72961a3205a8487218b6d69361c43a1297d6 (diff) | |
| download | forums-2f47c99432c604a2adaad73821602a4b1763caa8.tar forums-2f47c99432c604a2adaad73821602a4b1763caa8.tar.gz forums-2f47c99432c604a2adaad73821602a4b1763caa8.tar.bz2 forums-2f47c99432c604a2adaad73821602a4b1763caa8.tar.xz forums-2f47c99432c604a2adaad73821602a4b1763caa8.zip | |
[feature/avatars] Add more consistency to codebase
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/driver')
| -rw-r--r-- | phpBB/includes/avatar/driver/gravatar.php | 19 | ||||
| -rw-r--r-- | phpBB/includes/avatar/driver/remote.php | 15 |
2 files changed, 22 insertions, 12 deletions
diff --git a/phpBB/includes/avatar/driver/gravatar.php b/phpBB/includes/avatar/driver/gravatar.php index 11996ca561..2b10fd0c2d 100644 --- a/phpBB/includes/avatar/driver/gravatar.php +++ b/phpBB/includes/avatar/driver/gravatar.php @@ -77,13 +77,18 @@ class phpbb_avatar_driver_gravatar extends phpbb_avatar_driver require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext); } - $error = array_merge($error, validate_data(array( - 'email' => $row['avatar'], - ), array( - 'email' => array( - array('string', false, 6, 60), - array('email')), - ))); + $validate_array = validate_data( + array( + 'email' => $row['avatar'], + ), + array( + 'email' => array( + array('string', false, 6, 60), + array('email')) + ) + ); + + $error = array_merge($error, $validate_array); if (!empty($error)) { diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php index 9135a62eac..1f16fce1e7 100644 --- a/phpBB/includes/avatar/driver/remote.php +++ b/phpBB/includes/avatar/driver/remote.php @@ -66,11 +66,16 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext); } - $error = array_merge($error, validate_data(array( - 'url' => $url, - ), array( - 'url' => array('string', true, 5, 255), - ))); + $validate_array = validate_data( + array( + 'url' => $url, + ), + array( + 'url' => array('string', true, 5, 255), + ) + ); + + $error = array_merge($error, $validate_array); if (!empty($error)) { |