diff options
| author | Graham Eames <grahamje@users.sourceforge.net> | 2006-04-22 11:59:37 +0000 |
|---|---|---|
| committer | Graham Eames <grahamje@users.sourceforge.net> | 2006-04-22 11:59:37 +0000 |
| commit | e6a85132f6d4309b30d6b64a3fe49fbe7704bf8f (patch) | |
| tree | 825531ca97cac9def611fb676bd98d73177b4c1f /phpBB | |
| parent | 0bad52c9a55a1380ae1a287db984727ed70c0481 (diff) | |
| download | forums-e6a85132f6d4309b30d6b64a3fe49fbe7704bf8f.tar forums-e6a85132f6d4309b30d6b64a3fe49fbe7704bf8f.tar.gz forums-e6a85132f6d4309b30d6b64a3fe49fbe7704bf8f.tar.bz2 forums-e6a85132f6d4309b30d6b64a3fe49fbe7704bf8f.tar.xz forums-e6a85132f6d4309b30d6b64a3fe49fbe7704bf8f.zip | |
- Added a constant to indicate where we are for use in other functions
- Slight changes to writing of the config file, more to come
git-svn-id: file:///svn/phpbb/trunk@5818 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rwxr-xr-x | phpBB/install/index.php | 1 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 5fda7beba9..32728e0900 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -11,6 +11,7 @@ /** */ define('IN_PHPBB', true); +define('IN_INSTALL', true); // Error reporting level and runtime escaping //error_reporting(E_ERROR | E_WARNING | E_PARSE); diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 0d730a5273..7154eee9bc 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -701,7 +701,7 @@ class install_install extends module $config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused! // Attempt to write out the config file directly. If it works, this is the easiest way to do it ... - if (filesize($phpbb_root_path . 'config.' . $phpEx) == 0 && is_writeable($phpbb_root_path . 'config.' . $phpEx)) + if ((file_exists($phpbb_root_path . 'config.' . $phpEx) && is_writeable($phpbb_root_path . 'config.' . $phpEx)) || is_writable($phpbb_root_path)) { // Assume it will work ... if nothing goes wrong below $written = true; |