diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2012-07-17 15:16:43 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2012-07-17 15:16:43 -0700 |
| commit | 80f61259f927e5e37e7f7b0ce0da44da1dc84efe (patch) | |
| tree | 8cf8e7908ed9b93d1a8786396a8d59c993558e87 /activerecord/lib/active_record | |
| parent | d8745decaf59aad32aa2f09abdba99b8d0e48b31 (diff) | |
| download | rails-80f61259f927e5e37e7f7b0ce0da44da1dc84efe.tar.gz rails-80f61259f927e5e37e7f7b0ce0da44da1dc84efe.tar.bz2 rails-80f61259f927e5e37e7f7b0ce0da44da1dc84efe.zip | |
AR::Integration must be included after AM::Conversion
Integration's definition of #to_param must override
Conversion's. Otherwise, there is a regression from
3.1 in the behavior of a non-persisted AR::Base instance
which nevertheless has an id.
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/model.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/model.rb b/activerecord/lib/active_record/model.rb index 0015e3a567..fb3fb643ff 100644 --- a/activerecord/lib/active_record/model.rb +++ b/activerecord/lib/active_record/model.rb @@ -74,9 +74,9 @@ module ActiveRecord include Inheritance include Scoping include Sanitization - include Integration include AttributeAssignment include ActiveModel::Conversion + include Integration include Validations include CounterCache include Locking::Optimistic |