diff options
| -rwxr-xr-x | includes/install_inc.php | 2 | ||||
| -rwxr-xr-x | install.php | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/includes/install_inc.php b/includes/install_inc.php index 3af13d6..7b835a0 100755 --- a/includes/install_inc.php +++ b/includes/install_inc.php @@ -40,7 +40,7 @@ function set_menu( $pInstallFiles, $pStep ) { foreach( $pInstallFiles as $key => $menu_step ) { if( !isset( $menu_step['state'] ) ) { - if( !empty( $gBitDbType ) && $gBitUser->isAdmin() && !$_SESSION['first_install'] ) { + if( !empty( $gBitDbType ) && !isset( $_SESSION['first_install'] ) ) { $pInstallFiles[$key]['state'] = 'complete'; $pInstallFiles[$key]['icon'] = 'icon-ok'; } else { diff --git a/install.php b/install.php index be27b22..a5a7be7 100755 --- a/install.php +++ b/install.php @@ -87,7 +87,11 @@ if( !empty( $_REQUEST['reload'] )) { } // for pages that should only be shown during a first install -if( ( empty( $gBitDbType ) || !$gBitUser->isAdmin() ) || ( $_SESSION['first_install'] ) ) { +// Drive first-install mode from DB state only — installer access is controlled externally via symlink +if( !empty( $gBitDbType ) && $gBitInstaller->isInstalled() ) { + unset( $_SESSION['first_install'] ); +} +if( empty( $gBitDbType ) || isset( $_SESSION['first_install'] ) ) { $onlyDuringFirstInstall = TRUE; $_SESSION['first_install'] = TRUE; } else { |