makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15342] Catch exception in check_disk_space

Browse source 
PHPBB3-15342
This commit is contained in:
Rubén Calvo 2018-07-10 06:59:52 +02:00
parent e5d8b1600b
commit af7e3662b8
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
phpBB/phpbb/attachment/upload.php
View file

@ -336,21 +336,29 @@ class upload
*/
protected function check_disk_space()
{
$free_space = $this->storage->free_space();
if ($free_space !== false && $free_space <= $this->file->get('filesize'))
try
{
if ($this->auth->acl_get('a_'))
{
$this->file_data['error'][] = $this->language->lang('ATTACH_DISK_FULL');
}
else
{
$this->file_data['error'][] = $this->language->lang('ATTACH_QUOTA_REACHED');
}
$this->file_data['post_attach'] = false;
$free_space = $this->storage->free_space();
return false;
if ($free_space <= $this->file->get('filesize'))
{
if ($this->auth->acl_get('a_'))
{
$this->file_data['error'][] = $this->language->lang('ATTACH_DISK_FULL');
}
else
{
$this->file_data['error'][] = $this->language->lang('ATTACH_QUOTA_REACHED');
}
$this->file_data['post_attach'] = false;
return false;
}
}
catch (\phpbb\storage\exception\exception $e)
{
// Do nothing
}
return true;