[ticket/15134] Replace php native functions for filesystem service methods

PHPBB3-15134
This commit is contained in:
Rubén Calvo 2017-03-19 17:29:11 +01:00
parent e497937dd4
commit 018528b062

View file

@ -281,9 +281,13 @@ 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);
}
catch(\phpbb\filesystem\exception\filesystem_exception $e) {}
} }
return true; return true;
@ -304,6 +308,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'));
} }
} }