diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 00:15:32 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 00:15:32 +0200 |
| commit | 3ea17f1d144a7cd09db12f8d21a20ec3c07ac5c8 (patch) | |
| tree | c9ee9a2ce8c8684e1075e270dfeeac9174a1ea31 /phpBB/includes/functions_upload.php | |
| parent | 953ca2772867ee7d21491a757303d93a2b8cec53 (diff) | |
| parent | cae8448fe4f6c27e7c8df7a5e0e0bb4ee9bbc672 (diff) | |
| download | forums-3ea17f1d144a7cd09db12f8d21a20ec3c07ac5c8.tar forums-3ea17f1d144a7cd09db12f8d21a20ec3c07ac5c8.tar.gz forums-3ea17f1d144a7cd09db12f8d21a20ec3c07ac5c8.tar.bz2 forums-3ea17f1d144a7cd09db12f8d21a20ec3c07ac5c8.tar.xz forums-3ea17f1d144a7cd09db12f8d21a20ec3c07ac5c8.zip | |
Merge branch 'develop-ascraeus' into develop
* 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
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 { |