aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-05-10 15:02:10 +0200
committerTristan Darricau <github@nicofuma.fr>2014-05-10 15:09:25 +0200
commiteee2091201b5b76b7b5fddc20092ae69167fbb30 (patch)
treea85e5897517ca451ac61e1e988346e991714db43 /phpBB/includes
parentd4fc060bcd61228fdf78da4f2d290a7a17546c46 (diff)
downloadforums-eee2091201b5b76b7b5fddc20092ae69167fbb30.tar
forums-eee2091201b5b76b7b5fddc20092ae69167fbb30.tar.gz
forums-eee2091201b5b76b7b5fddc20092ae69167fbb30.tar.bz2
forums-eee2091201b5b76b7b5fddc20092ae69167fbb30.tar.xz
forums-eee2091201b5b76b7b5fddc20092ae69167fbb30.zip
[ticket/11226] filespec::move_file() should error correctly
PHPBB3-11226
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_upload.php2
1 files changed, 2 insertions, 0 deletions
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
{