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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-03-25 11:30:35 +01:00
commit 097f77dc66
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/phpbb/avatar/driver/upload.php
View file

@ -281,12 +281,20 @@ class upload extends \phpbb\avatar\driver\driver
); );
extract($this->dispatcher->trigger_event('core.avatar_driver_upload_delete_before', compact($vars))); extract($this->dispatcher->trigger_event('core.avatar_driver_upload_delete_before', compact($vars)));
if (!sizeof($error) && file_exists($filename)) if (!sizeof($error) && $this->filesystem->exists($filename))
{ {
@unlink($filename); try
{
$this->filesystem->remove($filename);
return true;
}
catch (\phpbb\filesystem\exception\filesystem_exception $e)
{
// Fail is covered by return statement below
}
} }
return true; return false;
} }
/** /**
@ -304,6 +312,6 @@ class upload extends \phpbb\avatar\driver\driver
*/ */
protected function can_upload() protected function can_upload()
{ {
return (file_exists($this->phpbb_root_path . $this->config['avatar_path']) && $this->filesystem->is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on')); return ($this->filesystem->exists($this->phpbb_root_path . $this->config['avatar_path']) && $this->filesystem->is_writable($this->phpbb_root_path . $this->config['avatar_path']) && (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on'));
} }
} }