diff options
| author |   Rubén Calvo <rubencm@gmail.com> | 2017-10-31 17:35:25 +0100 |
|---|---|---|
| committer | Rubén Calvo <rubencm@gmail.com> | 2018-05-01 14:40:02 +0200 |
| commit | f80c59cb05f8b2de609fdf227416b5c6526efb79 (patch) | |
| tree | 39d3daed5b400df37301676b6be7ec1f0830e037 /phpBB/phpbb/attachment | |
| parent | [ticket/15286] Add event to allow redirects (diff) | |
| download | phpbb-f80c59cb05f8b2de609fdf227416b5c6526efb79.tar.gz phpbb-f80c59cb05f8b2de609fdf227416b5c6526efb79.tar.bz2 phpbb-f80c59cb05f8b2de609fdf227416b5c6526efb79.zip | |
[ticket/15286] Fix tests after rebase
PHPBB3-15286
Diffstat (limited to 'phpBB/phpbb/attachment')
| -rw-r--r-- | phpBB/phpbb/attachment/upload.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/phpbb/attachment/upload.php b/phpBB/phpbb/attachment/upload.php index 89c2b8d804..8d5d5b1a12 100644 --- a/phpBB/phpbb/attachment/upload.php +++ b/phpBB/phpbb/attachment/upload.php @@ -203,6 +203,15 @@ class upload // Only then perform additional image checks. $this->file->move_file($this->storage, false, !$is_image); + if (count($this->file->error)) + { + $this->file->remove($this->storage); + $this->file_data['error'] = array_merge($this->file_data['error'], $this->file->error); + $this->file_data['post_attach'] = false; + + return $this->file_data; + } + return $this->file_data; } |