mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
Merge branch '3.3.x'
This commit is contained in:
@@ -428,9 +428,16 @@ class local implements adapter_interface, stream_interface
|
||||
*/
|
||||
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');
|
||||
}
|
||||
|
@@ -85,6 +85,7 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case
|
||||
'img_create_thumbnail' => true,
|
||||
));
|
||||
$config = $this->config;
|
||||
$this->phpbb_root_path = $phpbb_root_path;
|
||||
$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->request = $this->createMock('\phpbb\request\request');
|
||||
|
Reference in New Issue
Block a user