Commit ddb3e686ecbb027fc5238080a2bc12672bf43c8d
1 parent
06f96ca8
Exists in
staging
and in
4 other branches
fix wrong merge
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
vendor/plugins/access_control/lib/acts_as_accessible.rb
| @@ -19,9 +19,9 @@ module ActsAsAccessible | @@ -19,9 +19,9 @@ module ActsAsAccessible | ||
| 19 | nil | 19 | nil |
| 20 | end | 20 | end |
| 21 | 21 | ||
| 22 | - def affiliate(accessor, roles, attributes = {}) | 22 | + def affiliate(accessor, roles) |
| 23 | roles = [roles] unless roles.kind_of?(Array) | 23 | roles = [roles] unless roles.kind_of?(Array) |
| 24 | - roles.map {|role| accessor.add_role(role, self, attributes)}.any? | 24 | + roles.map {|role| accessor.add_role(role, self)}.any? |
| 25 | end | 25 | end |
| 26 | 26 | ||
| 27 | def disaffiliate(accessor, roles) | 27 | def disaffiliate(accessor, roles) |