diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-12 13:46:59 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-12 13:46:59 +0000 |
| commit | 8b4003f7fce9e089f2220e6f1a21681f7cf2df3d (patch) | |
| tree | 15333943091fc3ae79dedee46a6dd34ce3f1a1ec /lib/timezone_fixes.rb | |
| parent | 646fffde374e575ab53cfae78e7a0c521cd90d6f (diff) | |
| parent | c96b27c301023a6a1f50c12f0c387205b0255836 (diff) | |
Merge remote-tracking branch 'origin/release/0.6.8' into wdtk
Conflicts:
config/general.yml-example
Diffstat (limited to 'lib/timezone_fixes.rb')
| -rw-r--r-- | lib/timezone_fixes.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/timezone_fixes.rb b/lib/timezone_fixes.rb index b830ded4e..e6d2f9470 100644 --- a/lib/timezone_fixes.rb +++ b/lib/timezone_fixes.rb @@ -1,4 +1,4 @@ -# Taken from +# Taken from # https://rails.lighthouseapp.com/projects/8994/tickets/2946 # http://github.com/rails/rails/commit/6f97ad07ded847f29159baf71050c63f04282170 @@ -11,7 +11,6 @@ module ActiveRecord module ConnectionAdapters # :nodoc: module Quoting def quoted_date(value) - value.to_s(:db) if value.acts_like?(:time) zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal value.respond_to?(zone_conversion_method) ? value.send(zone_conversion_method) : value |