From d025d080ba78879b7ebf96c9e5c3d9f25af46162 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Thu, 1 Aug 2013 21:22:02 +0000
Subject: [PATCH] Fix regression detecting expired sessions

---
 scp/staff.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scp/staff.inc.php b/scp/staff.inc.php
index 77aa2c9b3..54ff91b99 100644
--- a/scp/staff.inc.php
+++ b/scp/staff.inc.php
@@ -63,7 +63,7 @@ if(!$thisstaff || !is_object($thisstaff) || !$thisstaff->getId() || !$thisstaff-
         $msg = $_SESSION['_staff']['auth']['msg'];
         unset($_SESSION['_staff']['auth']['msg']);
     }
-    elseif ($thisstaff && !$thisstaff->isValid())
+    elseif (isset($_SESSION['_staff']['userID']) && !$thisstaff->isValid())
         $msg = 'Session timed out due to inactivity';
     else
         $msg = 'Authentication Required';
-- 
GitLab