diff options
Diffstat (limited to 'activesupport/lib/active_support/core_ext/date_time/conversions.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/conversions.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/conversions.rb b/activesupport/lib/active_support/core_ext/date_time/conversions.rb index a9f821b01e..24168c7825 100644 --- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb +++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb @@ -1,5 +1,6 @@ require 'active_support/inflector' require 'active_support/core_ext/time/conversions' +require 'active_support/core_ext/date_time/calculations' class DateTime # Ruby 1.9 has DateTime#to_time which internally relies on Time. We define our own #to_time which allows @@ -72,6 +73,11 @@ class DateTime self end unless method_defined?(:to_datetime) + def self.civil_from_format(utc_or_local, year, month=1, day=1, hour=0, min=0, sec=0) + offset = utc_or_local.to_sym == :local ? local_offset : 0 + civil(year, month, day, hour, min, sec, offset) + end + # Converts datetime to an appropriate format for use in XML def xmlschema strftime("%Y-%m-%dT%H:%M:%S%Z") |