diff options
| author | Malf Furious <m@lfurio.us> | 2016-03-27 00:00:53 -0400 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2016-03-27 00:00:53 -0400 |
| commit | 7a2672164a73bb011a3d930df52c0643ee18457d (patch) | |
| tree | 4cb0bf7e68285037e799e7bb6a3c137f50a2363b | |
| parent | 62cdc987190be53909df29dbb3a3b44c6fbc51f0 (diff) | |
| parent | 85cead8ab00b13abaa7f729052792fc845756857 (diff) | |
| download | scrott-7a2672164a73bb011a3d930df52c0643ee18457d.tar.gz scrott-7a2672164a73bb011a3d930df52c0643ee18457d.zip | |
Merge branch 'bug/logout-non-user' into dev
| -rw-r--r-- | app/class/framework.class.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/class/framework.class.php b/app/class/framework.class.php index 74c4b14..4223d68 100644 --- a/app/class/framework.class.php +++ b/app/class/framework.class.php @@ -57,7 +57,14 @@ abstract class Framework function getCurrentUser() { if (isset($_SESSION['userguid'])) - return new User($_SESSION['userguid']); + { + $user = new User($_SESSION['userguid']); + + if ($user->type == "user") + return $user; + + $this->setCurrentUser(); + } return false; } |