Index: trunk/kernel/include/modules.php =================================================================== diff -u -r3863 -r3884 --- trunk/kernel/include/modules.php (.../modules.php) (revision 3863) +++ trunk/kernel/include/modules.php (.../modules.php) (revision 3884) @@ -812,11 +812,19 @@ if( !isset($FrontEnd) ) $FrontEnd = false; // if frontend not explicitly defined, than if($FrontEnd != 1) - $SessionQueryString = TRUE; + $SessionQueryString = true; -if(is_array($mod_prefix)) +if (is_array($mod_prefix)) { ParseEnv(); +} + if (defined('THIS_FILE') && (THIS_FILE == 'admin/index') ) { + // this is admin login screen & we don't have sid in url here, + // but session is already created by K4, then gether sid from it + $application =& kApplication::Instance(); + $var_list['sid'] = $application->GetSID(); + } + /* create the session object */ $ip = $_SERVER["REMOTE_ADDR"]; @@ -989,9 +997,9 @@ } } -if (strstr($_SERVER['SCRIPT_NAME'], 'install') && $objSession->Get("PortalUserId") == 0) { +/*if (strstr($_SERVER['SCRIPT_NAME'], 'install') && $objSession->Get("PortalUserId") == -2) { $objSession->Delete(); -} +}*/ if( !isset($SearchPerformed) ) $SearchPerformed = false; if($SearchPerformed == true) $objSearch->BuildIndexes();