Compare commits

...

3 commits

Author SHA1 Message Date
Marc Alexander
954bc07de1
Merge pull request #6835 from rxu/ticket/17529
[ticket/17529] Fix installer config.php availability checks
2025-06-25 17:43:39 +02:00
rxu
044536dffb
[ticket/17529] Remove unneeded wrapping curly braces
PHPBB-17529
2025-06-21 10:03:52 +07:00
rxu
6ccc6f0383
[ticket/17529] Fix installer config.php availability checks
PHPBB-17529
2025-06-20 22:00:05 +07:00

View file

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