Skip to content
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 9854874 + 5af6ac0 commit 6973523cc150de15667b0bfdc45c20442519c2aa @courtland committed
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/active_scaffold/finder.rb
View
4 lib/active_scaffold/finder.rb
@@ -111,9 +111,9 @@ def condition_value_for_datetime(value, conversion = :to_time)
Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[part].to_i}) rescue nil
elsif value.respond_to?(:strftime)
if conversion == :to_time
- # Explicitly get the localtime, because TimeWithZone#to_time in rails 3.2.3 returns UTC.
+ # Explicitly get the current zone, because TimeWithZone#to_time in rails 3.2.3 returns UTC.
# https://github.com/rails/rails/pull/2453
- value.to_time.localtime
+ value.to_time.in_time_zone
else
value.send(conversion)
end

0 comments on commit 6973523

Please sign in to comment.
Something went wrong with that request. Please try again.