mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

[ticket/13904] Fix uploading for use with new filespec class

Browse Source 
PHPBB3-13904
This commit is contained in:
Marc Alexander
2015-05-31 14:47:57 +02:00
parent 891ffb8ac7
commit 0cbb713cc2
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions_posting.php
View File

@@ -435,7 +435,7 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
$file = ($local) ? $upload->local_upload($local_storage, $local_filedata, $mimetype_guesser) : $upload->form_upload($form_name, $mimetype_guesser, $plupload);
if ($file->init_error)
if ($file->init_error())
{
$filedata['post_attach'] = false;
return $filedata;

16
phpBB/includes/functions_upload.php
View File

@@ -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;