aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorgbuesing <gbuesing@gmail.com>2008-04-21 00:08:45 -0500
committergbuesing <gbuesing@gmail.com>2008-04-21 00:08:45 -0500
commitc2c779044ffb1c435f4722f62fcbd400883f3225 (patch)
tree6c9edd08ba641b939fe898efe520315fb2e1100e /actionpack/lib
parentf386676661068573d2b58f6bd7a7245b4ff5ce5d (diff)
downloadrails-c2c779044ffb1c435f4722f62fcbd400883f3225.tar.gz
rails-c2c779044ffb1c435f4722f62fcbd400883f3225.tar.bz2
rails-c2c779044ffb1c435f4722f62fcbd400883f3225.zip
datetime_select defaults to Time.zone.now when config.time_zone is set
Diffstat (limited to 'actionpack/lib')
-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 c71d59f373..23b7f3ba7c 100755
--- a/actionpack/lib/action_view/helpers/date_helper.rb
+++ b/actionpack/lib/action_view/helpers/date_helper.rb
@@ -675,7 +675,7 @@ module ActionView
def default_time_from_options(default)
case default
when nil
- Time.now
+ Time.current
when Date, Time
default
else