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 pull request #6141 from 3D-I/ticket/16705

Browse source 
[ticket/16705] Fix check_disk_space function - PHP 8
This commit is contained in:
Marc Alexander 2021-03-05 20:52:38 +01:00
commit b978fd9dc6
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -296,8 +296,10 @@ class upload
*/ */
protected function check_disk_space() protected function check_disk_space()
{ {
if ($free_space = @disk_free_space($this->phpbb_root_path . $this->config['upload_path'])) if (function_exists('disk_free_space'))
{ {
$free_space = @disk_free_space($this->phpbb_root_path);
if ($free_space <= $this->file->get('filesize')) if ($free_space <= $this->file->get('filesize'))
{ {
if ($this->auth->acl_get('a_')) if ($this->auth->acl_get('a_'))

1
tests/attachment/upload_test.php
View file

@ -79,6 +79,7 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case
'img_create_thumbnail' => true, 'img_create_thumbnail' => true,
)); ));
$config = $this->config; $config = $this->config;
$this->phpbb_root_path = $phpbb_root_path;
$this->db = $this->new_dbal(); $this->db = $this->new_dbal();
$this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), $this->config, $this->db, $phpbb_root_path, $phpEx); $this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), $this->config, $this->db, $phpbb_root_path, $phpEx);
$this->request = $this->createMock('\phpbb\request\request'); $this->request = $this->createMock('\phpbb\request\request');