diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-02-15 05:21:20 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-02-15 14:24:35 +0100 |
| commit | a1b9acb72ec4b3a3d11f77efe64effb79e58b45d (patch) | |
| tree | ad7ca8bb436c93035daf0ae45f92a22b3c5355b8 /activemodel/lib | |
| parent | 201e67ed365c797795df09fcb8a7bc7ecfdbb30d (diff) | |
| download | rails-a1b9acb72ec4b3a3d11f77efe64effb79e58b45d.tar.gz rails-a1b9acb72ec4b3a3d11f77efe64effb79e58b45d.tar.bz2 rails-a1b9acb72ec4b3a3d11f77efe64effb79e58b45d.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 3f9feb7631..e1fb1e3231 100644 --- a/activemodel/lib/active_model/mass_assignment_security.rb +++ b/activemodel/lib/active_model/mass_assignment_security.rb @@ -224,12 +224,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 |