Skip to content

Commit 992e484

Browse files
authored
Merge pull request Zizaco#700 from jwright6/bf-352
Fixes Issue Zizaco#352
2 parents b999584 + 9edcc5e commit 992e484

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/Entrust/Traits/EntrustRoleTrait.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public function attachPermission($permission)
170170
}
171171

172172
if (is_array($permission)) {
173-
$permission = $permission['id'];
173+
return $this->attachPermissions($permission);
174174
}
175175

176176
$this->perms()->attach($permission);
@@ -185,11 +185,13 @@ public function attachPermission($permission)
185185
*/
186186
public function detachPermission($permission)
187187
{
188-
if (is_object($permission))
188+
if (is_object($permission)) {
189189
$permission = $permission->getKey();
190+
}
190191

191-
if (is_array($permission))
192-
$permission = $permission['id'];
192+
if (is_array($permission)) {
193+
return $this->detachPermissions($permission);
194+
}
193195

194196
$this->perms()->detach($permission);
195197
}

0 commit comments

Comments
 (0)