From eee2091201b5b76b7b5fddc20092ae69167fbb30 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 10 May 2014 15:02:10 +0200 Subject: [ticket/11226] filespec::move_file() should error correctly PHPBB3-11226 --- phpBB/includes/functions_upload.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/includes/functions_upload.php') diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index b4e165502b..e7a4c23ba4 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -308,6 +308,8 @@ class filespec if (file_exists($this->destination_file) && !$overwrite) { @unlink($this->filename); + $this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file); + return false; } else { -- cgit v1.2.1 From cee9b1d85686407276092748b93fc69cb12ddde1 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 10 May 2014 19:47:32 +0200 Subject: [ticket/11226] Use $user->lang() PHPBB3-11226 --- phpBB/includes/functions_upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions_upload.php') diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index e7a4c23ba4..16a05a0a56 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -308,7 +308,7 @@ class filespec if (file_exists($this->destination_file) && !$overwrite) { @unlink($this->filename); - $this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file); + $this->error[] = $user->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file); return false; } else -- cgit v1.2.1 From b75fb96bab92952011f796cf29611c6bff09dd37 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 28 May 2014 22:34:10 +0200 Subject: [ticket/11226] Explicity set file_moved to false PHPBB3-11226 --- phpBB/includes/functions_upload.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/includes/functions_upload.php') diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 16a05a0a56..21ee9a7119 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -309,6 +309,7 @@ class filespec { @unlink($this->filename); $this->error[] = $user->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file); + $this->file_moved = false; return false; } else -- cgit v1.2.1