Merge pull request #6141 from 3D-I/ticket/16705

[ticket/16705] Fix check_disk_space function - PHP 8
phpbb · Mar 5, 2021 · b978fd9 · b978fd9
2 parents ae7f383 + 5d18ad6
commit b978fd9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/phpBB/phpbb/attachment/upload.php b/phpBB/phpbb/attachment/upload.php
@@ -296,8 +296,10 @@ protected function check_attach_quota()
 	 */
 	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 ($this->auth->acl_get('a_'))

diff --git a/tests/attachment/upload_test.php b/tests/attachment/upload_test.php
@@ -79,6 +79,7 @@ protected function setUp(): void
 			'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');