From 15e04808fc3a6699ac857c2252cce70090df80ba Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 16 Aug 2008 13:11:50 +0000
Subject: [PATCH] writeable -> writable merge

git-svn-id: file:///svn/phpbb/trunk@8762 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_main.html    | 4 ++--
 phpBB/includes/acm/acm_file.php  | 4 ++--
 phpBB/includes/acp/acp_main.php  | 6 +++---
 phpBB/language/en/acp/common.php | 2 +-
 4 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/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php
index d8477376ea..1093ee1fa2 100644
--- a/phpBB/includes/acm/acm_file.php
+++ b/phpBB/includes/acm/acm_file.php
@@ -143,7 +143,7 @@ class acm
 				}
 			}
 		}
-		
+
 		set_config('cache_last_gc', time(), true);
 	}
 
@@ -438,7 +438,7 @@ class acm
 	*/
 	private 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 e5d7fc77c0..15d8462e32 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -459,9 +459,9 @@ class acp_main
 			$template->assign_var('S_REMOVE_INSTALL', true);
 		}
 
-		if (file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) && is_writeable(PHPBB_ROOT_PATH . 'config.' . PHP_EXT))
+		if (file_exists(PHPBB_ROOT_PATH . 'config.' . PHP_EXT) && is_writable(PHPBB_ROOT_PATH . 'config.' . PHP_EXT))
 		{
-			$template->assign_var('S_WRITEABLE_CONFIG', true);
+			$template->assign_var('S_WRITABLE_CONFIG', true);
 		}
 
 		$this->tpl_name = 'acp_main';
@@ -469,4 +469,4 @@ class acp_main
 	}
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index db59100915..b6a985d9d6 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -363,7 +363,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