Multiparameter attributes for time columns fail over to DateTime when out of range of Time

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8855 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 1 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index f273c04a94..642a7e2b96 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2472,12 +2472,11 @@ module ActiveRecord #:nodoc:
         )
       end
 
-      # Includes an ugly hack for Time.local instead of Time.new because the latter is reserved by Time itself.
       def instantiate_time_object(name, values)
         if Time.zone && !self.class.skip_time_zone_conversion_for_attributes.include?(name.to_sym)
           Time.zone.local(*values)
         else
-          @@default_timezone == :utc ? Time.utc(*values) : Time.local(*values)
+          @@default_timezone == :utc ? Time.utc_time(*values) : Time.local_time(*values)
         end
       end