Index: trunk/core/kernel/session/session.php
===================================================================
diff -u -r5219 -r6428
--- trunk/core/kernel/session/session.php	(.../session.php)	(revision 5219)
+++ trunk/core/kernel/session/session.php	(.../session.php)	(revision 6428)
@@ -412,13 +412,7 @@
 	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)
 		{
 			//we don't need to bother checking if we would not use it
 			$this->CookiesEnabled = false;
@@ -529,9 +523,6 @@
 			}
 		}
 
-		if ($this->Application->GetVar('front')) {
-			$this->CookiesEnabled = false;
-		}
 
 		$this->CachedSID = $sid;
 		return $this->CachedSID;
@@ -698,6 +689,7 @@
 		$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_url', $_SERVER['REQUEST_URI']);
 
 		$this->StoreVar('last_env', substr($this->Application->BuildEnv($t, Array('__URLENCODE__' => 1), 'all'), strlen(ENV_VAR_NAME)+1));
 	}