aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
authorgbuesing <gbuesing@gmail.com>2008-05-18 10:59:24 -0500
committergbuesing <gbuesing@gmail.com>2008-05-18 10:59:24 -0500
commite30a263bf1744d0b55d073c7d1087d0d64181d2c (patch)
tree5deb91e3c055264400c29b07740cc33f44269b98 /actionpack/lib/action_view/helpers
parentbe85868987675a158fd4111393b9161296431728 (diff)
downloadrails-e30a263bf1744d0b55d073c7d1087d0d64181d2c.tar.gz
rails-e30a263bf1744d0b55d073c7d1087d0d64181d2c.tar.bz2
rails-e30a263bf1744d0b55d073c7d1087d0d64181d2c.zip
InstanceTag#default_time_from_options overflows to DateTime
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rwxr-xr-xactionpack/lib/action_view/helpers/date_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/date_helper.rb b/actionpack/lib/action_view/helpers/date_helper.rb
index 8a9c8044ae..7ed6272898 100755
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -689,7 +689,7 @@ module ActionView
default[key] ||= time.send(key)
end
- Time.utc(default[:year], default[:month], default[:day], default[:hour], default[:min], default[:sec])
+ Time.utc_time(default[:year], default[:month], default[:day], default[:hour], default[:min], default[:sec])
end
end
end