Updates expSession to handle a mangled $user session variable

exponentcms · Oct 28, 2014 · ddb8c76 · ddb8c76
1 parent 89b4d22
commit ddb8c76
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/framework/core/subsystems/expSession.php b/framework/core/subsystems/expSession.php
@@ -180,7 +180,7 @@ public static function validate() {
 			}
 		}
 
-		if (isset($_SESSION[SYS_SESSION_KEY]['user'])) {
+		if (isset($_SESSION[SYS_SESSION_KEY]['user']) && get_class($_SESSION[SYS_SESSION_KEY]['user']) == 'user') {
 			$user = ($_SESSION[SYS_SESSION_KEY]['user']);
 		} else {
 			$user = new user();
@@ -308,6 +308,9 @@ public static function logout() {
 	 */
 	public static function loggedIn() {
 		//if ($anon){
+        if (isset($_SESSION[SYS_SESSION_KEY]['user']) && get_class($_SESSION[SYS_SESSION_KEY]['user']) != 'user') {
+            unset($_SESSION[SYS_SESSION_KEY]['user']);
+        }
 		return (isset($_SESSION[SYS_SESSION_KEY]['ticket']) && isset($_SESSION[SYS_SESSION_KEY]['user']));
 		//}
 		//else{