diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-15 05:21:20 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-02-15 05:21:20 -0800 |
| commit | 1c22c6f0d4ff0e0ee38135801b55be8b05b21845 (patch) | |
| tree | c19d64490782c36770979f59129baaf19ff08447 /activemodel/lib | |
| parent | 2f9e47713051e211a1866bb8e7af3151e70a9ba0 (diff) | |
| parent | d204918f9190afcf5f3f53adb957ca15aa644704 (diff) | |
| download | rails-1c22c6f0d4ff0e0ee38135801b55be8b05b21845.tar.gz rails-1c22c6f0d4ff0e0ee38135801b55be8b05b21845.tar.bz2 rails-1c22c6f0d4ff0e0ee38135801b55be8b05b21845.zip | |
Merge pull request #5049 from fabioyamate/master
Fix sanitize_for_mass_assigment when role is nil
Diffstat (limited to 'activemodel/lib')
| -rw-r--r-- | activemodel/lib/active_model/mass_assignment_security.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/mass_assignment_security.rb b/activemodel/lib/active_model/mass_assignment_security.rb index 13495d6786..95de039676 100644 --- a/activemodel/lib/active_model/mass_assignment_security.rb +++ b/activemodel/lib/active_model/mass_assignment_security.rb @@ -226,12 +226,12 @@ module ActiveModel protected - def sanitize_for_mass_assignment(attributes, role = :default) + def sanitize_for_mass_assignment(attributes, role = nil) _mass_assignment_sanitizer.sanitize(attributes, mass_assignment_authorizer(role)) end - def mass_assignment_authorizer(role = :default) - self.class.active_authorizer[role] + def mass_assignment_authorizer(role) + self.class.active_authorizer[role || :default] end end end |