diff options
Diffstat (limited to 'activesupport/lib/active_support/core_ext')
-rw-r--r-- | activesupport/lib/active_support/core_ext/date/conversions.rb | 12 |
1 files changed, 8 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 bae20c66db..4b9388dacd 100644 --- a/activesupport/lib/active_support/core_ext/date/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date/conversions.rb @@ -7,14 +7,14 @@ module ActiveSupport #:nodoc: :short => "%e %b", :long => "%B %e, %Y" } - + def self.included(klass) #:nodoc: klass.send(:alias_method, :to_default_s, :to_s) klass.send(:alias_method, :to_s, :to_formatted_s) end - + def to_formatted_s(format = :default) - DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_default_s + DATE_FORMATS[format] ? strftime(DATE_FORMATS[format]).strip : to_default_s end # To be able to keep Dates and Times interchangeable on conversions @@ -23,7 +23,11 @@ module ActiveSupport #:nodoc: end def to_time(form = :local) - ::Time.send(form, year, month, day) + if respond_to?(:hour) + ::Time.send(form, year, month, day, hour, min, sec) + else + ::Time.send(form, year, month, day) + end end def xmlschema |