diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-30 11:26:59 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-05-30 15:50:24 -0300 |
commit | c470001891990b067f9e76b5a5c0ae49be1a507f (patch) | |
tree | acabfb5ccaff4b31901d0759abd6d57d937f327b /activerecord/lib/active_record/base.rb | |
parent | f09ae8538f3625468ee175d5a4d9782e0d5ba415 (diff) | |
download | rails-c470001891990b067f9e76b5a5c0ae49be1a507f.tar.gz rails-c470001891990b067f9e76b5a5c0ae49be1a507f.tar.bz2 rails-c470001891990b067f9e76b5a5c0ae49be1a507f.zip |
Merge pull request #5810 from kennyj/fix_5797
Fix #5797. Error calling dup method on AR model with serialized field
Conflicts:
activerecord/lib/active_record/core.rb
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rw-r--r-- | activerecord/lib/active_record/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 8c8717b759..2ac259d52d 100644 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -533,7 +533,7 @@ module ActiveRecord #:nodoc: # The dup method does not preserve the timestamps (created|updated)_(at|on). def initialize_dup(other) cloned_attributes = other.clone_attributes(:read_attribute_before_type_cast) - self.class.initialize_attributes(cloned_attributes) + self.class.initialize_attributes(cloned_attributes, :serialized => false) cloned_attributes.delete(self.class.primary_key) |