Centralize permission caching (#2832)

flarum · May 4, 2021 · 7d4bd8a · 7d4bd8a
1 parent 3a6b884
commit 7d4bd8a
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/User/User.php b/src/User/User.php
@@ -379,11 +379,7 @@ public function hasPermission($permission)
             return true;
         }
 
-        if (is_null($this->permissions)) {
-            $this->permissions = $this->getPermissions();
-        }
-
-        return in_array($permission, $this->permissions);
+        return in_array($permission, $this->getPermissions());
     }
 
     /**
@@ -399,11 +395,7 @@ public function hasPermissionLike($match)
             return true;
         }
 
-        if (is_null($this->permissions)) {
-            $this->permissions = $this->getPermissions();
-        }
-
-        foreach ($this->permissions as $permission) {
+        foreach ($this->getPermissions() as $permission) {
             if (substr($permission, -strlen($match)) === $match) {
                 return true;
             }
@@ -739,7 +731,11 @@ public function permissions()
      */
     public function getPermissions()
     {
-        return $this->permissions()->pluck('permission')->all();
+        if (is_null($this->permissions)) {
+            $this->permissions = $this->permissions()->pluck('permission')->all();
+        }
+
+        return $this->permissions;
     }
 
     /**