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 /activerecord/lib/active_record/core.rb | |
| 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 'activerecord/lib/active_record/core.rb')
| -rw-r--r-- | activerecord/lib/active_record/core.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb index 9b7cba08de..1ad910c4bc 100644 --- a/activerecord/lib/active_record/core.rb +++ b/activerecord/lib/active_record/core.rb @@ -302,7 +302,7 @@ module ActiveRecord assign_attributes(attributes) if attributes yield self if block_given? - _run_initialize_callbacks + run_callbacks :initialize end # Initialize an empty model object from +coder+. +coder+ should be @@ -329,8 +329,8 @@ module ActiveRecord self.class.define_attribute_methods - _run_find_callbacks - _run_initialize_callbacks + run_callbacks :find + run_callbacks :initialize self end @@ -366,7 +366,7 @@ module ActiveRecord @attributes = @attributes.dup @attributes.reset(self.class.primary_key) - _run_initialize_callbacks + run_callbacks(:initialize) @new_record = true @destroyed = false |