Merge pull request #700 from jwright6/bf-352

Fixes Issue #352
Zizaco · Dec 29, 2016 · 992e484 · 992e484 · devsalman · Jan 10, 2017
2 parents b999584 + 9edcc5e
commit 992e484
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/Entrust/Traits/EntrustRoleTrait.php b/src/Entrust/Traits/EntrustRoleTrait.php
@@ -170,7 +170,7 @@ public function attachPermission($permission)
         }
 
         if (is_array($permission)) {
-            $permission = $permission['id'];
+            return $this->attachPermissions($permission);
         }
 
         $this->perms()->attach($permission);
@@ -185,11 +185,13 @@ public function attachPermission($permission)
      */
     public function detachPermission($permission)
     {
-        if (is_object($permission))
+        if (is_object($permission)) {
             $permission = $permission->getKey();
+        }
 
-        if (is_array($permission))
-            $permission = $permission['id'];
+        if (is_array($permission)) {
+            return $this->detachPermissions($permission);
+        }
 
         $this->perms()->detach($permission);
     }