diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-06 18:58:19 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-06 18:58:19 -0300 |
| commit | c539cc006179c98d418c6914ce567f657b6f1966 (patch) | |
| tree | 16855e039ebab046747325dd5083c37bdba58616 /activemodel/lib/active_model | |
| parent | a956ec964078ee533644fae2a99e68eda0a7c9d5 (diff) | |
| parent | bdc1d329d4eea823d07cf010064bd19c07099ff3 (diff) | |
| download | rails-c539cc006179c98d418c6914ce567f657b6f1966.tar.gz rails-c539cc006179c98d418c6914ce567f657b6f1966.tar.bz2 rails-c539cc006179c98d418c6914ce567f657b6f1966.zip | |
Merge pull request #19448 from tgxworld/fix_activesupport_callbacks_clash_on_run
Fix AS::Callbacks raising an error when `:run` callback is defined.
Diffstat (limited to 'activemodel/lib/active_model')
| -rw-r--r-- | activemodel/lib/active_model/validations.rb | 2 | ||||
| -rw-r--r-- | activemodel/lib/active_model/validations/callbacks.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb index 176d4c0607..74d60327d6 100644 --- a/activemodel/lib/active_model/validations.rb +++ b/activemodel/lib/active_model/validations.rb @@ -401,7 +401,7 @@ module ActiveModel protected def run_validations! #:nodoc: - _run_validate_callbacks + run_callbacks :validate errors.empty? end diff --git a/activemodel/lib/active_model/validations/callbacks.rb b/activemodel/lib/active_model/validations/callbacks.rb index 4b58ef66e3..b4301c23e4 100644 --- a/activemodel/lib/active_model/validations/callbacks.rb +++ b/activemodel/lib/active_model/validations/callbacks.rb @@ -109,7 +109,7 @@ module ActiveModel # Overwrite run validations to include callbacks. def run_validations! #:nodoc: - _run_validation_callbacks { super } + run_callbacks(:validation) { super } end end end |