diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2008-08-22 13:32:34 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-08-22 13:32:34 +0000 |
commit | 8174462e895966ce18c336b60dda93e562f4096f (patch) | |
tree | fe66ca7fa6b892e1db0de0bd7cf889ce72ce8ee9 /phpBB/install | |
parent | a45ac24bd7f0b7ffba38827c43a853af32aa512f (diff) | |
download | forums-8174462e895966ce18c336b60dda93e562f4096f.tar forums-8174462e895966ce18c336b60dda93e562f4096f.tar.gz forums-8174462e895966ce18c336b60dda93e562f4096f.tar.bz2 forums-8174462e895966ce18c336b60dda93e562f4096f.tar.xz forums-8174462e895966ce18c336b60dda93e562f4096f.zip |
Merge chmod changes into trunk
git-svn-id: file:///svn/phpbb/trunk@8781 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
-rw-r--r-- | phpBB/install/install_install.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 23e7c22dbb..a95cfbaae3 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -458,16 +458,13 @@ class install_install extends module if (!file_exists(PHPBB_ROOT_PATH . $dir)) { @mkdir(PHPBB_ROOT_PATH . $dir, 0777); - @chmod(PHPBB_ROOT_PATH . $dir, 0777); + phpbb_chmod(PHPBB_ROOT_PATH . $dir, CHMOD_READ | CHMOD_WRITE); } // Now really check if (file_exists(PHPBB_ROOT_PATH . $dir) && is_dir(PHPBB_ROOT_PATH . $dir)) { - if (!@is_writable(PHPBB_ROOT_PATH . $dir)) - { - @chmod(PHPBB_ROOT_PATH . $dir, 0777); - } + phpbb_chmod(PHPBB_ROOT_PATH . $dir, CHMOD_READ | CHMOD_WRITE); $exists = true; } @@ -952,7 +949,8 @@ class install_install extends module if ($written) { - @chmod(PHPBB_ROOT_PATH . 'config.' . PHP_EXT, 0644); + // 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); } } |