diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 14:12:46 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-12 14:12:46 -0500 |
| commit | 8a93a35def8aefb38f97cc9c27b80fd9e773ec01 (patch) | |
| tree | 4e8cc57243ba56fa5df58b641f78efbcc7e25189 /phpBB | |
| parent | 91672b6d561d2122b509b83bea3f13699c2bab87 (diff) | |
| parent | 01b9f9f9b6f14d602ce57a37f0969707d1f0c41b (diff) | |
| download | forums-8a93a35def8aefb38f97cc9c27b80fd9e773ec01.tar forums-8a93a35def8aefb38f97cc9c27b80fd9e773ec01.tar.gz forums-8a93a35def8aefb38f97cc9c27b80fd9e773ec01.tar.bz2 forums-8a93a35def8aefb38f97cc9c27b80fd9e773ec01.tar.xz forums-8a93a35def8aefb38f97cc9c27b80fd9e773ec01.zip | |
Merge remote-tracking branch 'remotes/Marc/ticket/11548-develop' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11548-develop:
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/avatar/driver/upload.php | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php index baf51f61c1..685ac4f349 100644 --- a/phpBB/includes/avatar/driver/upload.php +++ b/phpBB/includes/avatar/driver/upload.php @@ -77,6 +77,32 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver } elseif (!empty($this->config['allow_avatar_remote_upload']) && !empty($url)) { + if (!preg_match('#^(http|https|ftp)://#i', $url)) + { + $url = 'http://' . $url; + } + + if (!function_exists('validate_data')) + { + require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); + } + + $validate_array = validate_data( + array( + 'url' => $url, + ), + array( + 'url' => array('string', true, 5, 255), + ) + ); + + $error = array_merge($error, $validate_array); + + if (!empty($error)) + { + return false; + } + $file = $upload->remote_upload($url); } else |