aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
diff options
context:
space:
mode:
authorAngelo capilleri <capilleri@yahoo.com>2012-06-08 19:39:17 +0200
committerAngelo capilleri <capilleri@yahoo.com>2012-06-12 18:04:44 +0200
commitb97e0a1127d45e25e4281d6c1b5fb9a57f0efea6 (patch)
tree4550c65275a9423b484b17af55a75e43bf1b1916 /activemodel/lib/active_model
parentfa352c46da1b89534f2ddb04a602b7d09c0f5872 (diff)
downloadrails-b97e0a1127d45e25e4281d6c1b5fb9a57f0efea6.tar.gz
rails-b97e0a1127d45e25e4281d6c1b5fb9a57f0efea6.tar.bz2
rails-b97e0a1127d45e25e4281d6c1b5fb9a57f0efea6.zip
Fix the the backport of the object dup with the ruby 1.9.3p194.
At the end of initialize_dup was added the call to super if it exists, so it also works with 1.8.7 where initialize_dup doesn't exist. This issu was introduced with the pull request #6324
Diffstat (limited to 'activemodel/lib/active_model')
-rw-r--r--activemodel/lib/active_model/validations.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb
index 18cd53e130..f38121c175 100644
--- a/activemodel/lib/active_model/validations.rb
+++ b/activemodel/lib/active_model/validations.rb
@@ -168,8 +168,9 @@ module ActiveModel
# Clean the +Errors+ object if instance is duped
def initialize_dup(other) # :nodoc:
@errors = nil
+ super if defined?(super)
end
-
+
# Backport dup from 1.9 so that #initialize_dup gets called
unless Object.respond_to?(:initialize_dup)
def dup # :nodoc: