Index: branches/unlabeled/unlabeled-1.156.2/core/kernel/application.php
===================================================================
diff -u -r6104 -r6235
--- branches/unlabeled/unlabeled-1.156.2/core/kernel/application.php	(.../application.php)	(revision 6104)
+++ branches/unlabeled/unlabeled-1.156.2/core/kernel/application.php	(.../application.php)	(revision 6235)
@@ -1327,7 +1327,7 @@
 		$session =& $this->recallObject('Session');
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : 0;
 		$sid = $session->NeedQueryString() && !$this->RewriteURLs($ssl) ? $this->GetSID() : '';
-		if (getArrayValue($params,'admin') == 1) $sid = $this->GetSID();
+//		if (getArrayValue($params,'admin') == 1) $sid = $this->GetSID();
 
 		$ret = '';
 		if ($env_var) {
@@ -1480,7 +1480,11 @@
 		}
 
 		ob_end_flush();
-		$this->Session->SaveData();
+		// session expiration is called from session initialization,
+		// that's why $this->Session may be not defined here
+		if (is_object($this->Session)) {
+			$this->Session->SaveData();
+		}
 		exit;
 	}