Index: branches/RC/core/units/general/inp_ses_storage.php
===================================================================
diff -u -N -r9639 -r10294
--- branches/RC/core/units/general/inp_ses_storage.php	(.../inp_ses_storage.php)	(revision 9639)
+++ branches/RC/core/units/general/inp_ses_storage.php	(.../inp_ses_storage.php)	(revision 10294)
@@ -81,9 +81,9 @@
 	{
 		$time = adodb_mktime();
 		// Update LastAccessed only if it's newer than 1/10 of session timeout - perfomance optimization to eliminate needless updates on every click
-		if ($time - $this->DirectVars['LastAccessed'] > $this->SessionTimeout/10) {
-			$this->SetField($session, $this->TimestampField, $time);
-		}
+//		if ($time - $this->DirectVars['LastAccessed'] > $this->SessionTimeout/10) {
+			$this->SetField($session, $this->TimestampField, $time + $this->SessionTimeout);
+//		}
 	}
 
 
@@ -103,7 +103,7 @@
 
 	function GetExpiredSIDs()
 	{
-		$query = ' SELECT '.$this->IDField.' FROM '.$this->TableName.' WHERE  '.$this->TimestampField.' < '.(adodb_mktime()-$this->SessionTimeout);
+		$query = ' SELECT '.$this->IDField.' FROM '.$this->TableName.' WHERE  '.$this->TimestampField.' < '.(adodb_mktime());
 		$ret = $this->Conn->GetCol($query);
 		if($ret) {
 			$this->DeleteEditTables();