diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-05-28 22:34:10 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-05-28 22:34:10 +0200 |
| commit | b75fb96bab92952011f796cf29611c6bff09dd37 (patch) | |
| tree | be076b8208c94317c59fbad1acc36aeccb2964fb | |
| parent | 6a3b343dfce3b0c758f94b8768f5a767a95f69ef (diff) | |
| download | forums-b75fb96bab92952011f796cf29611c6bff09dd37.tar forums-b75fb96bab92952011f796cf29611c6bff09dd37.tar.gz forums-b75fb96bab92952011f796cf29611c6bff09dd37.tar.bz2 forums-b75fb96bab92952011f796cf29611c6bff09dd37.tar.xz forums-b75fb96bab92952011f796cf29611c6bff09dd37.zip | |
[ticket/11226] Explicity set file_moved to false
PHPBB3-11226
| -rw-r--r-- | phpBB/includes/functions_upload.php | 1 | ||||
| -rw-r--r-- | tests/upload/fileupload_test.php | 3 |
2 files changed, 3 insertions, 1 deletions
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 diff --git a/tests/upload/fileupload_test.php b/tests/upload/fileupload_test.php index b30bfe59b4..c362c3461e 100644 --- a/tests/upload/fileupload_test.php +++ b/tests/upload/fileupload_test.php @@ -110,7 +110,8 @@ class phpbb_fileupload_test extends phpbb_test_case copy($this->path . 'jpg', $this->path . 'jpg.jpg'); $file = $upload->local_upload($this->path . 'jpg.jpg'); $this->assertEquals(0, sizeof($file->error)); - $file->move_file('../tests/upload/fixture'); + $this->assertFalse($file->move_file('../tests/upload/fixture')); + $this->assertFalse($file->file_moved); $this->assertEquals(1, sizeof($file->error)); } |