diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-28 11:04:26 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-28 11:04:26 +0000 |
| commit | ed24dd9aeb670bf6639af9e223b7df4deef604bf (patch) | |
| tree | ba748fc826036d6a4ae99b43e90d056cc8a63b88 | |
| parent | e759598fc6c220a053d59865a248b5e1c3bd6662 (diff) | |
| download | forums-ed24dd9aeb670bf6639af9e223b7df4deef604bf.tar forums-ed24dd9aeb670bf6639af9e223b7df4deef604bf.tar.gz forums-ed24dd9aeb670bf6639af9e223b7df4deef604bf.tar.bz2 forums-ed24dd9aeb670bf6639af9e223b7df4deef604bf.tar.xz forums-ed24dd9aeb670bf6639af9e223b7df4deef604bf.zip | |
fix for bug #5676 - of course the "delete install folder" notice should not occur if directly within installation.
git-svn-id: file:///svn/phpbb/trunk@6684 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/session.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index ad6a049a65..1408463c0b 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -1210,7 +1210,7 @@ class user extends session // Disable board if the install/ directory is still present // For the brave development army we do not care about this, else we need to comment out this everytime we develop locally - if (!defined('DEBUG_EXTRA') && !defined('ADMIN_START') && !defined('IN_LOGIN') && file_exists($phpbb_root_path . 'install')) + if (!defined('DEBUG_EXTRA') && !defined('ADMIN_START') && !defined('IN_INSTALL') && !defined('IN_LOGIN') && file_exists($phpbb_root_path . 'install')) { // Adjust the message slightly according to the permissions if ($auth->acl_gets('a_', 'm_')) diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 069022f0e5..8bd94f036e 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -96,9 +96,7 @@ class install_update extends module include_once($phpbb_root_path . 'includes/diff/diff.' . $phpEx); - /** - * Check for user session - * - commented out for beta3 with "broken" install check routine + // Check for user session if (!$user->data['is_registered']) { login_box('', $user->lang['LOGIN_UPDATE_EXPLAIN']); @@ -108,7 +106,6 @@ class install_update extends module { trigger_error($user->lang['NO_AUTH_UPDATE']); } - */ // If we are within the intro page we need to make sure we get up-to-date version info if ($sub == 'intro') |