From fb026ec07f4b2545f1e2e6fcaae1a0f14298766b Mon Sep 17 00:00:00 2001
From: slawkens1 <slawkens@gmail.com>
Date: Fri, 26 Jan 2018 22:27:00 +0100
Subject: [PATCH] * verify is user was logged on HOOK_LOGOUT

---
 system/login.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/system/login.php b/system/login.php
index 504434d8..4c9ee5f0 100644
--- a/system/login.php
+++ b/system/login.php
@@ -32,18 +32,20 @@ if($current_session !== false)
 }
 
 if(ACTION == 'logout' && !isset($_REQUEST['account_login'])) {
-	if($hooks->trigger(HOOK_LOGOUT, array('logged' => $logged, 'account' => (isset($account_logged) ? $account_logged : new OTS_Account()), 'password' => getSession('password')))) {
-		unsetSession('account');
-		unsetSession('password');
-		unsetSession('remember_me');
+	if(isset($account_logged) && $account_logged->isLoaded()) {
+		if($hooks->trigger(HOOK_LOGOUT, array('account' => $account_logged, 'password' => getSession('password')))) {
+			unsetSession('account');
+			unsetSession('password');
+			unsetSession('remember_me');
 
-		$logged = false;
-		unset($account_logged);
+			$logged = false;
+			unset($account_logged);
 
-		if(isset($_REQUEST['redirect']))
-		{
-			header('Location: ' . urldecode($_REQUEST['redirect']));
-			exit;
+			if(isset($_REQUEST['redirect']))
+			{
+				header('Location: ' . urldecode($_REQUEST['redirect']));
+				exit;
+			}
 		}
 	}
 }