From 0cbb713cc2a6249cb12507db7d0fa78ce8663ae6 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 31 May 2015 14:47:57 +0200
Subject: [ticket/13904] Fix uploading for use with new filespec class

PHPBB3-13904
---
 phpBB/phpbb/files/filespec.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'phpBB/phpbb/files/filespec.php')

diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php
index 4e52d13d01..8501b217f7 100644
--- a/phpBB/phpbb/files/filespec.php
+++ b/phpBB/phpbb/files/filespec.php
@@ -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']]))
 				{
-- 
cgit v1.2.1