mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-08 09:46:46 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/11226] Explicity set file_moved to false
  [ticket/11226] Add tests
  [ticket/11226] Use $user->lang()
  [ticket/11226] filespec::move_file() should error correctly
This commit is contained in:
Joas Schilling
2014-05-29 00:15:32 +02:00
parent 953ca27728 cae8448fe4
commit 3ea17f1d14
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/includes/functions_upload.php
View File

@@ -311,6 +311,9 @@ class filespec
if (file_exists($this->destination_file) && !$overwrite)
{
@unlink($this->filename);
$this->error[] = $user->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file);
$this->file_moved = false;
return false;
}
else
{