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

[ticket/15286] Fix tests after rebase

Browse Source 
PHPBB3-15286
This commit is contained in:
Rubén Calvo
2017-10-31 17:35:25 +01:00
parent 6bd01d1506
commit f80c59cb05
8 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/phpbb/attachment/upload.php
View File

@@ -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;
}