diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index 6126c16d63..3bfa7602c7 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -21,10 +21,10 @@
-
+
{L_WARNING}
-
{L_WRITEABLE_CONFIG}
+
{L_WRITABLE_CONFIG}
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 4956fd7b0e..8865456e41 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -87,7 +87,7 @@
- [Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)
- [Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.
- - [Change] Display warning in ACP if config.php file is left writeable.
+ - [Change] Display warning in ACP if config.php file is left writable.
- [Change] More restrictive chmod to new files being created.
- [Feature] Allow limited inheritance for templates sets.
- [Feature] Allow hard disabling of the template editor.
diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
index 5851016f3d..8462febdcf 100644
--- a/phpBB/includes/acm/acm_file.php
+++ b/phpBB/includes/acm/acm_file.php
@@ -154,7 +154,7 @@ class acm
}
}
}
-
+
set_config('cache_last_gc', time(), true);
}
@@ -491,7 +491,7 @@ class acm
*/
function remove_file($filename, $check = false)
{
- if ($check && !@is_writeable($this->cache_dir))
+ if ($check && !@is_writable($this->cache_dir))
{
// E_USER_ERROR - not using language entry - intended.
trigger_error('Unable to remove files within ' . $this->cache_dir . '. Please check directory permissions.', E_USER_ERROR);
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 523fcc98f3..2999c05f03 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -463,9 +463,9 @@ class acp_main
$template->assign_var('S_REMOVE_INSTALL', true);
}
- if (file_exists($phpbb_root_path . 'config.' . $phpEx) && is_writeable($phpbb_root_path . 'config.' . $phpEx))
+ if (file_exists($phpbb_root_path . 'config.' . $phpEx) && is_writable($phpbb_root_path . 'config.' . $phpEx))
{
- $template->assign_var('S_WRITEABLE_CONFIG', true);
+ $template->assign_var('S_WRITABLE_CONFIG', true);
}
$this->tpl_name = 'acp_main';
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 7c7ae08707..256898c2c1 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -362,7 +362,7 @@ $lang = array_merge($lang, array(
'VIEW_INACTIVE_USERS' => 'View inactive users',
'WELCOME_PHPBB' => 'Welcome to phpBB',
- 'WRITEABLE_CONFIG' => 'Your config file (config.php) is currently world-writeable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: chmod 640 config.php).',
+ 'WRITABLE_CONFIG' => 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: chmod 640 config.php).',
));
// Inactive Users