mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +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

8
phpBB/phpbb/files/filespec.php
View File

@@ -60,7 +60,7 @@ class filespec
* File Class
* @access private
*/
function filespec(\phpbb\filesystem\filesystem_interface $phpbb_filesystem, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
function __construct(\phpbb\filesystem\filesystem_interface $phpbb_filesystem, \phpbb\mimetype\guesser $mimetype_guesser = null, \phpbb\plupload\plupload $plupload = null)
{
// @todo call this via files
//$this->set_upload_ary($upload_ary);
@@ -109,9 +109,9 @@ class filespec
*
* @return bool True if there was an init error, false if not
*/
protected function init_error()
public function init_error()
{
return !isset($upload_ary);
return !isset($this->filename);
}
/**
@@ -422,7 +422,7 @@ class filespec
$this->height = $this->image_info['height'];
// Check image type
$types = fileupload::image_types();
$types = \fileupload::image_types();
if (!isset($types[$this->image_info['type']]) || !in_array($this->extension, $types[$this->image_info['type']]))
{