aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/avatar/driver/upload.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/avatar/driver/upload.php')
-rw-r--r--phpBB/includes/avatar/driver/upload.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php
index 4facb243ac..1bb86cf158 100644
--- a/phpBB/includes/avatar/driver/upload.php
+++ b/phpBB/includes/avatar/driver/upload.php
@@ -75,10 +75,15 @@ class phpbb_avatar_driver_upload extends phpbb_avatar_driver
{
$file = $upload->form_upload('avatar_upload_file');
}
- else
+ elseif (!empty($this->config['allow_avatar_remote_upload']) && !empty($url))
{
$file = $upload->remote_upload($url);
}
+ else
+ {
+ $error[] = 'NO_AVATAR_SELECTED';
+ return false;
+ }
$prefix = $this->config['avatar_salt'] . '_';
$file->clean_filename('avatar', $prefix, $row['id']);