Merge pull request #343 from lexxyungcarter/master

updated allPermissions() method
santigarcor · Apr 17, 2019 · 600aa87 · 600aa87
2 parents 01948b6 + c50de39
commit 600aa87
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Traits/LaratrustUserTrait.php b/src/Traits/LaratrustUserTrait.php
@@ -590,7 +590,7 @@ public function allPermissions()
             return $role->permissions;
         });
 
-        return $this->permissions->merge($roles)->unique('name');
+        return $this->permissions()->get()->merge($roles)->unique('name');
     }
 
     /**