From 22a7f469595377b41cd24f3578ef27590be95d28 Mon Sep 17 00:00:00 2001
From: flashwave <me@flash.moe>
Date: Wed, 3 Oct 2018 01:09:41 +0200
Subject: [PATCH] Fixed another one of em oversights.

---
 misuzu.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/misuzu.php b/misuzu.php
index e3632759..32f31928 100644
--- a/misuzu.php
+++ b/misuzu.php
@@ -299,18 +299,18 @@ MIG;
         ');
         $getUserDisplayInfo->bindValue('user_id', $mszUserId);
         $userDisplayInfo = $getUserDisplayInfo->execute() ? $getUserDisplayInfo->fetch() : [];
-        tpl_var('current_user', $userDisplayInfo);
     }
 
     csrf_init($app->getCsrfSecretKey(), empty($userDisplayInfo) ? ip_remote_address() : $_COOKIE['msz_sid']);
 
     $privateInfo = $app->getPrivateInfo();
 
-    if (!$misuzuBypassLockdown && $privateInfo['enabled'] && !empty($userDisplayInfo)) {
+    if (!$misuzuBypassLockdown && $privateInfo['enabled']) {
         if (user_session_active()) {
             $generalPerms = perms_get_user(MSZ_PERMS_GENERAL, $userDisplayInfo['user_id']);
 
-            if (!perms_check($generalPerms, $privateInfo['permission'])) {
+            if ($privateInfo['permission'] && !perms_check($generalPerms, $privateInfo['permission'])) {
+                unset($userDisplayInfo);
                 user_session_stop(); // au revoir
             }
         } else {
@@ -322,6 +322,10 @@ MIG;
         }
     }
 
+    if (!empty($userDisplayInfo)) {
+        tpl_var('current_user', $userDisplayInfo);
+    }
+
     $inManageMode = starts_with($_SERVER['REQUEST_URI'], '/manage');
     $hasManageAccess = perms_check(perms_get_user(MSZ_PERMS_GENERAL, $userDisplayInfo['user_id'] ?? 0), MSZ_PERM_GENERAL_CAN_MANAGE);
     tpl_var('has_manage_access', $hasManageAccess);