aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorGeoff Buesing <gbuesing@gmail.com>2008-02-10 17:02:22 +0000
committerGeoff Buesing <gbuesing@gmail.com>2008-02-10 17:02:22 +0000
commit94fa9fb74541b60ed04f2694558a6a98a9ce1cab (patch)
treeb615ef44b629aae80daef6a66ac5bb9b4e52e03d /activerecord/lib/active_record
parent2c8fb682cb6dfe889b31bbb76c90de5011aec009 (diff)
downloadrails-94fa9fb74541b60ed04f2694558a6a98a9ce1cab.tar.gz
rails-94fa9fb74541b60ed04f2694558a6a98a9ce1cab.tar.bz2
rails-94fa9fb74541b60ed04f2694558a6a98a9ce1cab.zip
TimeZone#new renamed #local, so that new TimeWithZone instances can be created via Time.zone.local()
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8847 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record')
-rwxr-xr-xactiverecord/lib/active_record/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index fc45930d73..f273c04a94 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -2475,7 +2475,7 @@ module ActiveRecord #:nodoc:
# 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.new(*values)
+ Time.zone.local(*values)
else
@@default_timezone == :utc ? Time.utc(*values) : Time.local(*values)
end