mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-03 23:37:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2021-01-01 16:56:01 +01:00
parent bf0a4d00ac dba60740f6
commit dc5a4c4752
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/includes/acp/acp_main.php
View File

@@ -661,7 +661,7 @@ class acp_main
}
}
if (!defined('PHPBB_DISABLE_CONFIG_CHECK') && file_exists($phpbb_root_path . 'config.' . $phpEx) && $phpbb_filesystem->is_writable($phpbb_root_path . 'config.' . $phpEx))
if (!defined('PHPBB_DISABLE_CONFIG_CHECK'))
{
// World-Writable? (000x)
$template->assign_var('S_WRITABLE_CONFIG', (bool) (@fileperms($phpbb_root_path . 'config.' . $phpEx) & 0x0002));
@@ -672,6 +672,7 @@ class acp_main
$encoding_translation = $this->php_ini->getString('mbstring.encoding_translation');
$http_input = $this->php_ini->getString('mbstring.http_input');
$http_output = $this->php_ini->getString('mbstring.http_output');
if (extension_loaded('mbstring'))
{
$template->assign_vars(array(

9
phpBB/phpbb/filesystem/filesystem.php
View File

@@ -575,13 +575,10 @@ class filesystem implements filesystem_interface
}
else
{
$handle = @fopen($file, 'c');
$handle = new \SplFileInfo($file);
if (is_resource($handle))
{
fclose($handle);
return true;
}
// Returns TRUE if writable, FALSE otherwise
return $handle->isWritable();
}
}
else