From c2133550d0a54968e53b961783fc97af6e343e85 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 28 Jul 2008 14:36:27 +0000
Subject: [PATCH] writable instead of writeable. :/

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8698 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_main.html    | 4 ++--
 phpBB/docs/CHANGELOG.html        | 2 +-
 phpBB/includes/acm/acm_file.php  | 4 ++--
 phpBB/includes/acp/acp_main.php  | 4 ++--
 phpBB/language/en/acp/common.php | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

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 @@
 		</div>
 	<!-- ENDIF -->
 
-	<!-- IF S_WRITEABLE_CONFIG -->
+	<!-- IF S_WRITABLE_CONFIG -->
 		<div class="errorbox">
 			<h3>{L_WARNING}</h3>
-			<p>{L_WRITEABLE_CONFIG}</p>
+			<p>{L_WRITABLE_CONFIG}</p>
 		</div>
 	<!-- ENDIF -->
 
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 @@
 	<ul>
 		<li>[Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)</li>
 		<li>[Change] No longer allow the direct use of MULTI_INSERT in sql_build_array. sql_multi_insert() must be used.</li>
-		<li>[Change] Display warning in ACP if config.php file is left writeable.</li>
+		<li>[Change] Display warning in ACP if config.php file is left writable.</li>
 		<li>[Change] More restrictive chmod to new files being created.</li>
 		<li>[Feature] Allow limited inheritance for templates sets.</li>
 		<li>[Feature] Allow hard disabling of the template editor.</li>
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: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 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: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',
 ));
 
 // Inactive Users