diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-08 15:38:51 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-08 15:38:51 -0300 |
| commit | 670281c6b2e9b9e8c51a140f2a5f66b251f1b84b (patch) | |
| tree | ab141872d72e010c8a0fe371d22a00914c97e1eb /activemodel/lib/active_model/validations_repair_helper.rb | |
| parent | 39e4e76d15233bb1cb0b778d920f54efe86bb4f0 (diff) | |
| parent | 1a0f822037c408a392ffa7b6e1ecbe5951ab48db (diff) | |
| download | rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.tar.gz rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.tar.bz2 rails-670281c6b2e9b9e8c51a140f2a5f66b251f1b84b.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'activemodel/lib/active_model/validations_repair_helper.rb')
| -rw-r--r-- | activemodel/lib/active_model/validations_repair_helper.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations_repair_helper.rb b/activemodel/lib/active_model/validations_repair_helper.rb index 432e411308..0809e7c0d1 100644 --- a/activemodel/lib/active_model/validations_repair_helper.rb +++ b/activemodel/lib/active_model/validations_repair_helper.rb @@ -7,7 +7,8 @@ module ActiveModel model_classes.inject({}) do |repair, klass| repair[klass] ||= {} [:validate, :validate_on_create, :validate_on_update].each do |callback| - the_callback = klass.instance_variable_get("@#{callback.to_s}_callbacks") + ivar = "@#{callback.to_s}_callbacks" + the_callback = klass.instance_variable_get(ivar) if klass.instance_variable_defined?(ivar) repair[klass][callback] = (the_callback.nil? ? nil : the_callback.dup) end repair |