diff options
Diffstat (limited to 'activesupport/lib/active_support')
4 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/conversions.rb b/activesupport/lib/active_support/core_ext/date/conversions.rb index 511c69544e..e0fadbd72f 100644 --- a/activesupport/lib/active_support/core_ext/date/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date/conversions.rb @@ -53,7 +53,7 @@ module ActiveSupport #:nodoc: # Converts self to a Ruby DateTime object; time is set to beginning of day def to_datetime - ::DateTime.civil(year, month, day, 0, 0, 0, 0, 0) + ::DateTime.civil(year, month, day, 0, 0, 0, 0) end if RUBY_VERSION < '1.9' def xmlschema diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb index 096778e26f..48d3f6d91d 100644 --- a/activesupport/lib/active_support/core_ext/string/conversions.rb +++ b/activesupport/lib/active_support/core_ext/string/conversions.rb @@ -15,7 +15,7 @@ module ActiveSupport #:nodoc: end def to_datetime - ::DateTime.civil(*ParseDate.parsedate(self)[0..5].map {|arg| arg || 0} << 0 << 0) + ::DateTime.civil(*ParseDate.parsedate(self)[0..5].map {|arg| arg || 0} << 0) end end end diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index e9f1011563..7181bac3fd 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -36,7 +36,7 @@ module ActiveSupport #:nodoc: ::Time.send(utc_or_local, year, month, day, hour, min, sec, usec) rescue offset = utc_or_local.to_sym == :local ? ::DateTime.local_offset : 0 - ::DateTime.civil(year, month, day, hour, min, sec, offset, 0) + ::DateTime.civil(year, month, day, hour, min, sec, offset) end # wraps class method time_with_datetime_fallback with utc_or_local == :utc diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb index c0bc8b4313..4b6ad1eef3 100644 --- a/activesupport/lib/active_support/core_ext/time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/time/conversions.rb @@ -43,7 +43,7 @@ module ActiveSupport #:nodoc: # converts to a Ruby DateTime instance; preserves utc offset def to_datetime - ::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400), 0) + ::DateTime.civil(year, month, day, hour, min, sec, Rational(utc_offset, 86400)) end end end |