Index: trunk/core/kernel/session/session.php
===================================================================
diff -u -r4626 -r4630
--- trunk/core/kernel/session/session.php	(.../session.php)	(revision 4626)
+++ trunk/core/kernel/session/session.php	(.../session.php)	(revision 4630)
@@ -649,13 +649,13 @@
 
 	function SaveData()
 	{
-		if( $this->Application->GetVar('t') != 'help' && !$this->Application->GetVar('skip_last_template'))
-		{
-			$last_env = $this->Application->BuildEnv($this->Application->GetVar('t'), Array('m_opener' => 'u', '__URLENCODE__' => 1), 'all');
+		if (!$this->Application->GetVar('skip_last_template')) {
+			$t = $this->Application->GetVar('t');
+			$last_env = $this->Application->BuildEnv($t, Array('m_opener' => 'u', '__URLENCODE__' => 1), 'all');
 			$last_template = basename($_SERVER['PHP_SELF']).'|';
 			$last_template .= substr($last_env, strlen(ENV_VAR_NAME) + 1);
 			$this->StoreVar('last_template',  $last_template);
-			$this->StoreVar('last_env', substr($this->Application->BuildEnv($this->Application->GetVar('t'),Array('pass'=>'all', '__URLENCODE__' => 1)), strlen(ENV_VAR_NAME)+1 ));
+			$this->StoreVar('last_env', substr($this->Application->BuildEnv($t, Array('pass'=>'all', '__URLENCODE__' => 1)), strlen(ENV_VAR_NAME)+1));
 		}
 
 		$this->PrintSession('after save');