Compare commits

..

No commits in common. "954bc07de1ce7be39993bd5eb007a7c588db4b3b" and "4f10e6e212108ada3dcff3eedfe3c0fa6cbefb6f" have entirely different histories.

View file

@ -145,12 +145,7 @@ class check_filesystem extends \phpbb\install\task_base
// Try to create file if it does not exists // Try to create file if it does not exists
if (!file_exists($path)) if (!file_exists($path))
{ {
if (!is_resource($fp = @fopen($path, 'w'))) $fp = @fopen($path, 'w');
{
$exists = $writable = false;
}
else
{
@fclose($fp); @fclose($fp);
try try
{ {
@ -161,14 +156,21 @@ class check_filesystem extends \phpbb\install\task_base
} }
catch (\phpbb\filesystem\exception\filesystem_exception $e) catch (\phpbb\filesystem\exception\filesystem_exception $e)
{ {
$writable = false; // Do nothing
} }
} }
}
else if (!$this->filesystem->is_writable($path)) if (file_exists($path))
{
if (!$this->filesystem->is_writable($path))
{ {
$writable = false; $writable = false;
} }
}
else
{
$exists = $writable = false;
}
$this->set_test_passed(($exists && $writable) || $failable); $this->set_test_passed(($exists && $writable) || $failable);