diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-16 11:55:13 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-09-16 11:55:13 +0200 |
| commit | a562fea2306c8ba5b47a161568bea5fbe2ffd19f (patch) | |
| tree | fcab88a3a5dd5f05c77934eef0983793f2e2bd6a /phpBB/phpbb/avatar/driver/remote.php | |
| parent | d4a47409f7da09790f38d3418401cbe34f8c3703 (diff) | |
| parent | 6651c1d8f4aead15f4750989670f75721390ee21 (diff) | |
| download | forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.gz forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.bz2 forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.tar.xz forums-a562fea2306c8ba5b47a161568bea5fbe2ffd19f.zip | |
Merge pull request #3727 from marc1706/ticket/13904
[ticket/13904] Refactor attachments functions into service
* marc1706/ticket/13904: (66 commits)
[ticket/13904] Use filespec's get_filesize instead of calling filesize()
[ticket/13904] Set properties to protected where possible in filespec
[ticket/13904] Fix tests after changes to factory
[ticket/13904] Minor coding style fixes
[ticket/13904] Add language entries for error messages in upload class
[ticket/13904] Modify files for updated fast-image-size library
[ticket/13904] Update composer.lock
[ticket/13904] Improve code coverage
[ticket/13904] Add unit tests for local upload type
[ticket/13904] Minor coding style fixes
[ticket/13904] Improve test coverage of base upload type class
[ticket/13904] Improve test coverage of remote upload type
[ticket/13904] Improve test coverage of form upload type
[ticket/13904] Improve test coverage of filespec class
[ticket/13904] Add back tests for retrieving floats
[ticket/13904] Use ini_get() wrapper in file upload types
[ticket/13904] Modify files for changes in ini wrapper
[ticket/13904] Add bantu/ini-get-wrapper to composer.json
[ticket/13904] Switch around constructor arguments
[ticket/13904] Use \phpbb\php\ini class for ini_get()
...
Diffstat (limited to 'phpBB/phpbb/avatar/driver/remote.php')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/remote.php | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/phpBB/phpbb/avatar/driver/remote.php b/phpBB/phpbb/avatar/driver/remote.php index 90443c9b4e..0526b9184e 100644 --- a/phpBB/phpbb/avatar/driver/remote.php +++ b/phpBB/phpbb/avatar/driver/remote.php @@ -114,13 +114,8 @@ class remote extends \phpbb\avatar\driver\driver return false; } - if (!class_exists('fileupload')) - { - include($this->phpbb_root_path . 'includes/functions_upload.' . $this->php_ext); - } - - $types = \fileupload::image_types(); - $extension = strtolower(\filespec::get_extension($url)); + $types = \phpbb\files\upload::image_types(); + $extension = strtolower(\phpbb\files\filespec::get_extension($url)); // Check if this is actually an image if ($file_stream = @fopen($url, 'r')) |