aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/avatar/driver/remote.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/avatar/driver/remote.php')
-rw-r--r--phpBB/includes/avatar/driver/remote.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/avatar/driver/remote.php b/phpBB/includes/avatar/driver/remote.php
index b7522ac3e1..1da5fc16e8 100644
--- a/phpBB/includes/avatar/driver/remote.php
+++ b/phpBB/includes/avatar/driver/remote.php
@@ -82,7 +82,10 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
$url = 'http://' . $url;
}
- require_once($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
+ if (!function_exists('user_add'))
+ {
+ require($this->phpbb_root_path . 'includes/functions_user' . $this->php_ext);
+ }
$error = array_merge($error, validate_data(array(
'url' => $url,
@@ -128,7 +131,11 @@ class phpbb_avatar_driver_remote extends phpbb_avatar_driver
return false;
}
- include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+ if (!class_exists('fileupload'))
+ {
+ include_once($this->phpbb_root_path . 'includes/functions_upload' . $this->php_ext);
+ }
+
$types = fileupload::image_types();
$extension = strtolower(filespec::get_extension($url));