diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 00:15:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 00:15:10 +0200 |
| commit | cae8448fe4f6c27e7c8df7a5e0e0bb4ee9bbc672 (patch) | |
| tree | 57999c59795a823fca697013b15c53a7a897f1ee /phpBB/includes/functions_upload.php | |
| parent | 305be2ae64dc3236d9e39a97d35394ba171482b1 (diff) | |
| parent | b75fb96bab92952011f796cf29611c6bff09dd37 (diff) | |
| download | forums-cae8448fe4f6c27e7c8df7a5e0e0bb4ee9bbc672.tar forums-cae8448fe4f6c27e7c8df7a5e0e0bb4ee9bbc672.tar.gz forums-cae8448fe4f6c27e7c8df7a5e0e0bb4ee9bbc672.tar.bz2 forums-cae8448fe4f6c27e7c8df7a5e0e0bb4ee9bbc672.tar.xz forums-cae8448fe4f6c27e7c8df7a5e0e0bb4ee9bbc672.zip | |
Merge pull request #2432 from Nicofuma/ticket/11226
[ticket/11226] filespec::move_file() should error correctly
* Nicofuma/ticket/11226:
[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
Diffstat (limited to 'phpBB/includes/functions_upload.php')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 77ad2d202c..94eef89c05 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -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 { |