2 files changed, 12 insertions, 6 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index e4520d7f03..e91f8bb56d 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -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;
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;