Index: trunk/core/kernel/session/session.php
===================================================================
diff -u -r3472 -r3559
--- trunk/core/kernel/session/session.php	(.../session.php)	(revision 3472)
+++ trunk/core/kernel/session/session.php	(.../session.php)	(revision 3559)
@@ -640,14 +640,14 @@
 
 	function SaveData()
 	{
-		if( $this->Application->GetVar('t') != 'help' )
+		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'), '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')), strlen(ENV_VAR_NAME)+1 ));
 		}
-		$this->StoreVar('last_env', substr($this->Application->BuildEnv($this->Application->GetVar('t'),Array('pass'=>'all')), strlen(ENV_VAR_NAME)+1 ));
 
 		$this->PrintSession('after save');
 		$this->Storage->SaveData($this);