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

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2021-03-05 21:32:43 +01:00
commit 3137070d50
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/phpbb/storage/adapter/local.php
View file

@ -428,9 +428,16 @@ class local implements adapter_interface, stream_interface
*/ */
public function free_space() public function free_space()
{ {
$free_space = @disk_free_space($this->root_path); if (function_exists('disk_free_space'))
{
$free_space = @disk_free_space($this->root_path);
if ($free_space === false) if ($free_space === false)
{
throw new exception('STORAGE_CANNOT_GET_FREE_SPACE');
}
}
else
{ {
throw new exception('STORAGE_CANNOT_GET_FREE_SPACE'); throw new exception('STORAGE_CANNOT_GET_FREE_SPACE');
} }

1
tests/attachment/upload_test.php
View file

@ -85,6 +85,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');