2 files changed, 4 insertions, 10 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index a68cdab988..f918a01786 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -232,12 +232,6 @@ include(PHPBB_ROOT_PATH . 'language/' . $language . '/posting.' . PHP_EXT);
 
 // usually we would need every single constant here - and it would be consistent. For 3.0.x, use a dirty hack... :(
 
-// Define needed constants
-define('CHMOD_ALL', 7);
-define('CHMOD_READ', 4);
-define('CHMOD_WRITE', 2);
-define('CHMOD_EXECUTE', 1);
-
 $mode = request_var('mode', 'overview');
 $sub = request_var('sub', '');
 
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index f0d5d70d3e..7e93f008f6 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -458,13 +458,13 @@ class install_install extends module
 			if (!file_exists(PHPBB_ROOT_PATH . $dir))
 			{
 				@mkdir(PHPBB_ROOT_PATH . $dir, 0777);
-				phpbb_chmod(PHPBB_ROOT_PATH . $dir, CHMOD_READ | CHMOD_WRITE);
+				phpbb_chmod(PHPBB_ROOT_PATH . $dir, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
 			}
 
 			// Now really check
 			if (file_exists(PHPBB_ROOT_PATH . $dir) && is_dir(PHPBB_ROOT_PATH . $dir))
 			{
-				phpbb_chmod(PHPBB_ROOT_PATH . $dir, CHMOD_READ | CHMOD_WRITE);
+				phpbb_chmod(PHPBB_ROOT_PATH . $dir, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
 				$exists = true;
 			}
 
@@ -950,7 +950,7 @@ class install_install extends module
 			if ($written)
 			{
 				// We may revert back to chmod() if we see problems with users not able to change their config.php file directly
-				phpbb_chmod(PHPBB_ROOT_PATH . 'config.' . PHP_EXT, CHMOD_READ);
+				phpbb_chmod(PHPBB_ROOT_PATH . 'config.' . PHP_EXT, phpbb::CHMOD_READ | phpbb::CHMOD_WRITE);
 			}
 		}
 
@@ -1871,7 +1871,7 @@ class install_install extends module
 		foreach ($this->bot_list as $bot_name => $bot_ary)
 		{
 			$user_row = array(
-				'user_type'				=> USER_IGNORE,
+				'user_type'				=> phpbb::USER_IGNORE,
 				'group_id'				=> $group_id,
 				'username'				=> $bot_name,
 				'user_regdate'			=> time(),