Index: trunk/admin/install.php =================================================================== diff -u -r3216 -r3330 --- trunk/admin/install.php (.../install.php) (revision 3216) +++ trunk/admin/install.php (.../install.php) (revision 3330) @@ -72,8 +72,9 @@ ini_set('include_path', '.'); +if (!defined('IS_INSTALL')) define('IS_INSTALL',1); if( file_exists($pathtoroot.'debug.php') && !(defined('DEBUG_MODE') && DEBUG_MODE) ) include_once($pathtoroot.'debug.php'); -if(!defined('IS_INSTALL'))define('IS_INSTALL',1); + $admin = substr($path,strlen($pathtoroot)); $state = isset($_GET["state"]) ? $_GET["state"] : ''; if(!strlen($state)) @@ -146,7 +147,8 @@ $db_savings = Array('dbinfo', 'db_config_save', 'db_reconfig_save'); //, 'reinstall_process' if( isset($g_DBType) && $g_DBType && strlen($state)>0 && !in_array($state, $db_savings) ) { - require_once($pathtoroot."kernel/startup.php"); + define('REL_PATH', 'admin'); + require_once($pathtoroot."kernel/startup.php"); $localURL=$rootURL."kernel/"; $adminURL = $rootURL.$admin; $imagesURL = $adminURL."/images"; @@ -158,6 +160,8 @@ //require_once ($pathtoroot."kernel/admin/include/navmenu.php"); require_once ($pathtolocal."admin/include/navmenu.php"); require_once($pathtoroot.$admin."/toolbar.php"); + + set_cookie(SESSION_COOKIE_NAME, '', adodb_mktime() - 3600, rtrim(BASE_PATH, '/') ); } function GetPathChar($path = null)