Index: trunk/core/kernel/session/session.php =================================================================== diff -u -r5024 -r5219 --- trunk/core/kernel/session/session.php (.../session.php) (revision 5024) +++ trunk/core/kernel/session/session.php (.../session.php) (revision 5219) @@ -233,7 +233,7 @@ $sql = 'DELETE FROM '.$this->TableName.$where_clause; $this->Conn->Query($sql); - + // delete debugger ouputs left of expired sessions foreach ($expired_sids as $expired_sid) { $debug_file = KERNEL_PATH.'/../cache/debug_@'.$expired_sid.'@.txt'; @@ -412,7 +412,13 @@ function CheckIfCookiesAreOn() { // $this->CheckDuplicateCookies(); - if ($this->Mode == smGET_ONLY || (defined('INPORTAL_ENV')&&INPORTAL_ENV && $this->Application->IsAdmin() && !$this->Application->GetVar('front')) ) + if ($this->Mode == smGET_ONLY || + ( defined('INPORTAL_ENV') && + INPORTAL_ENV && + $this->Application->IsAdmin() + && + !$this->Application->GetVar('front')) + ) { //we don't need to bother checking if we would not use it $this->CookiesEnabled = false; @@ -692,10 +698,10 @@ $last_env = $this->Application->BuildEnv($t, Array('m_opener' => 'u', '__URLENCODE__' => 1), 'all'); $last_template = basename($_SERVER['PHP_SELF']).'|'.substr($last_env, strlen(ENV_VAR_NAME) + 1); $this->StoreVar('last_template', $last_template); - + $this->StoreVar('last_env', substr($this->Application->BuildEnv($t, Array('__URLENCODE__' => 1), 'all'), strlen(ENV_VAR_NAME)+1)); } - + function StoreVar($name, $value) { $this->Data->Set($name, $value);