diff options
author | Michal Čihař <michal@cihar.com> | 2006-05-15 11:57:43 +0400 |
---|---|---|
committer | Michal Čihař <michal@cihar.com> | 2006-05-15 11:57:43 +0400 |
commit | bd1c06cb4f21aebf389155fbcb3239c9692d37c0 (patch) | |
tree | c4ad6fb26413941aea1bb942958f30105f32862c | |
parent | 0381ffcd725daeeeeec93828bdf72ab681deee3e (diff) |
Fix detection of writable config (bug #1488447).
-rwxr-xr-x | ChangeLog | 1 | ||||
-rw-r--r-- | scripts/setup.php | 3 |
2 files changed, 3 insertions, 1 deletions
@@ -7,6 +7,7 @@ $Source$ 2006-05-15 Michal Čihař <michal@cihar.com> * scripts/setup.php: Compatibility with security tokens (bug #1488453). + * scripts/setup.php: Fix detection of writable config (bug #1488447). 2006-05-14 Michal Čihař <michal@cihar.com> * libraries/common.lib.php: Fix reading database list with MySQL wildcards diff --git a/scripts/setup.php b/scripts/setup.php index 9f2b8b21d5..527dc2d57b 100644 --- a/scripts/setup.php +++ b/scripts/setup.php @@ -1155,7 +1155,8 @@ if ($action != 'download') { // Check whether we can write to configuration $fail_dir = FALSE; $fail_dir = $fail_dir || !is_dir('./config/'); - $fail_dir = $fail_dir || !is_writable('./config/config.inc.php'); + $fail_dir = $fail_dir || !is_writable('./config/'); + $fail_dir = $fail_dir || (file_exists('./config/config.inc.php') && !is_writable('./config/config.inc.php')); $config = @fopen('./config/config.inc.php', 'a'); $fail_dir = $fail_dir || ($config === FALSE); @fclose($config); |