diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-26 23:06:38 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-26 23:06:38 +0100 |
| commit | cb1d98ab7f588a38fcae680aca839b805caf2a23 (patch) | |
| tree | dd7898dd12a35e908ac6a1b9d7d3418e994d3d1e /phpBB/includes/avatar/driver/upload.php | |
| parent | 0abec06b09c71feb709b6101949181ff7ec4d882 (diff) | |
| download | forums-cb1d98ab7f588a38fcae680aca839b805caf2a23.tar forums-cb1d98ab7f588a38fcae680aca839b805caf2a23.tar.gz forums-cb1d98ab7f588a38fcae680aca839b805caf2a23.tar.bz2 forums-cb1d98ab7f588a38fcae680aca839b805caf2a23.tar.xz forums-cb1d98ab7f588a38fcae680aca839b805caf2a23.zip | |
[feature/avatars] Check for existing functions rather than using _once
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/avatar/driver/upload.php')
| -rw-r--r-- | phpBB/includes/avatar/driver/upload.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/avatar/driver/upload.php b/phpBB/includes/avatar/driver/upload.php index f00033d6bd..497dd8ad19 100644 --- a/phpBB/includes/avatar/driver/upload.php +++ b/phpBB/includes/avatar/driver/upload.php @@ -72,7 +72,10 @@ class phpbb_avatar_driver_upload 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); + } $upload = new fileupload('AVATAR_', array('jpg', 'jpeg', 'gif', 'png'), $this->config['avatar_filesize'], $this->config['avatar_min_width'], $this->config['avatar_min_height'], $this->config['avatar_max_width'], $this->config['avatar_max_height'], (isset($this->config['mime_triggers']) ? explode('|', $this->config['mime_triggers']) : false)); |