makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix for bug #5676 - of course the "delete install folder" notice should not occur if directly within installation.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6684 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-11-28 11:04:26 +00:00
parent e759598fc6
commit ed24dd9aeb
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/session.php
View file

@ -1210,7 +1210,7 @@ class user extends session
// Disable board if the install/ directory is still present // 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 // 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 // Adjust the message slightly according to the permissions
if ($auth->acl_gets('a_', 'm_')) if ($auth->acl_gets('a_', 'm_'))

5
phpBB/install/install_update.php
View file

@ -96,9 +96,7 @@ class install_update extends module
include_once($phpbb_root_path . 'includes/diff/diff.' . $phpEx); include_once($phpbb_root_path . 'includes/diff/diff.' . $phpEx);
/** // Check for user session
* Check for user session
* - commented out for beta3 with "broken" install check routine
if (!$user->data['is_registered']) if (!$user->data['is_registered'])
{ {
login_box('', $user->lang['LOGIN_UPDATE_EXPLAIN']); login_box('', $user->lang['LOGIN_UPDATE_EXPLAIN']);
@ -108,7 +106,6 @@ class install_update extends module
{ {
trigger_error($user->lang['NO_AUTH_UPDATE']); 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 we are within the intro page we need to make sure we get up-to-date version info
if ($sub == 'intro') if ($sub == 'intro')