From 235c040a9e4cdfbb62fdf331f40df64cc549b192 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 27 Feb 2014 17:59:12 +0100
Subject: [PATCH] Fixed session delete (logout) issues

---
 .../lib/system/session/SessionHandler.class.php | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index 0291590032..14f431a787 100644
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\system\session;
 use wcf\data\user\User;
+use wcf\data\user\UserEditor;
 use wcf\page\ITrackablePage;
 use wcf\system\cache\builder\SpiderCacheBuilder;
 use wcf\system\cache\builder\UserGroupPermissionCacheBuilder;
@@ -559,6 +560,17 @@ class SessionHandler extends SingletonFactory {
 	 * Deletes this session and it's related data.
 	 */
 	public function delete() {
+		// clear storage
+		if ($this->user->userID) {
+			self::resetSessions(array($this->user->userID));
+				
+			// update last activity time
+			if (!class_exists('\wcf\system\WCFACP', false)) {
+				$editor = new UserEditor($this->user);
+				$editor->update(array('lastActivityTime' => TIME_NOW));
+			}
+		}
+		
 		// set user to guest
 		$this->changeUser(new User(null), true);
 		
@@ -566,11 +578,6 @@ class SessionHandler extends SingletonFactory {
 		$sessionEditor = new $this->sessionEditorClassName($this->session);
 		$sessionEditor->delete();
 		
-		// clear storage
-		if ($this->user->userID) {
-			self::resetSessions(array($this->user->userID));
-		}
-		
 		// disable update
 		$this->disableUpdate();
 	}
-- 
2.20.1