diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-05-31 14:47:57 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-09 08:27:35 +0200 |
| commit | 0cbb713cc2a6249cb12507db7d0fa78ce8663ae6 (patch) | |
| tree | 77e3ca909b083376ad20eda4c356e917b935de70 /phpBB/includes/functions_upload.php | |
| parent | 891ffb8ac76637f1ee84c16464ec6ad654131126 (diff) | |
| download | forums-0cbb713cc2a6249cb12507db7d0fa78ce8663ae6.tar forums-0cbb713cc2a6249cb12507db7d0fa78ce8663ae6.tar.gz forums-0cbb713cc2a6249cb12507db7d0fa78ce8663ae6.tar.bz2 forums-0cbb713cc2a6249cb12507db7d0fa78ce8663ae6.tar.xz forums-0cbb713cc2a6249cb12507db7d0fa78ce8663ae6.zip | |
[ticket/13904] Fix uploading for use with new filespec class
PHPBB3-13904
Diffstat (limited to 'phpBB/includes/functions_upload.php')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 220d31098c..c759631c47 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -169,9 +169,11 @@ class fileupload } } - $file = new filespec($upload, $this, $this->filesystem, $mimetype_guesser, $plupload); + $file = new \phpbb\files\filespec($this->filesystem, $mimetype_guesser, $plupload); + $file->set_upload_ary($upload); + $file->set_upload_namespace($this); - if ($file->init_error) + if ($file->init_error()) { $file->error[] = ''; return $file; @@ -250,9 +252,11 @@ class fileupload $upload['type'] = $filedata['type']; } - $file = new filespec($upload, $this, $this->filesystem, $mimetype_guesser); + $file = new \phpbb\files\filespec($this->filesystem, $mimetype_guesser); + $file->set_upload_ary($upload); + $file->set_upload_namespace($this); - if ($file->init_error) + if ($file->init_error()) { $file->error[] = ''; return $file; @@ -488,7 +492,9 @@ class fileupload $upload_ary['tmp_name'] = $filename; - $file = new filespec($upload_ary, $this, $this->filesystem, $mimetype_guesser); + $file = new \phpbb\files\filespec($this->filesystem, $mimetype_guesser); + $file->set_upload_ary($upload_ary); + $file->set_upload_namespace($this); $this->common_checks($file); return $file; |