fix wrong merge

Leandro Santos
1 parent 06f96ca8
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
     nil
   end
  
-  def affiliate(accessor, roles, attributes = {})
+  def affiliate(accessor, roles)
     roles = [roles] unless roles.kind_of?(Array)
-    roles.map {|role| accessor.add_role(role, self, attributes)}.any?
+    roles.map {|role| accessor.add_role(role, self)}.any?
   end
  
   def disaffiliate(accessor, roles)
...	...	@@ -19,9 +19,9 @@ module ActsAsAccessible
19	19	nil
20	20	end
21	21
22		- def affiliate(accessor, roles, attributes = {})
	22	+ def affiliate(accessor, roles)
23	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	25	end
26	26
27	27	def disaffiliate(accessor, roles)
...	...