change split roles logic

esvit · Nov 26, 2013 · 67138a5 · 67138a5
1 parent 0c942e2
commit 67138a5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/server/Bazalt/Auth/Model/User.php b/server/Bazalt/Auth/Model/User.php
@@ -276,11 +276,13 @@ public function getPermissions($site = null)
             }
         } else {
             $roles = Role::getGuestRoles();
-            $currentRole = \Bazalt\Auth::getCurrentRole();
-            if(!$this->isGuest() && $currentRole) {
-                $roles = [
-                    $currentRole
-                ];
+            if(!$this->isGuest()) {
+                $currentRole = \Bazalt\Auth::getCurrentRole();
+                if($currentRole) {
+                    $roles = [
+                        $currentRole
+                    ];
+                }
             }
             foreach($roles as $role) {
                 $res = $role->getPermissions();