aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-06-04 19:49:13 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-06-04 19:49:13 +0000
commit4685fa0c20fbf3e78eaad94756e0f4a644447a10 (patch)
tree461cc78b22b047c178093c6b7fac6333a0e40de6 /activesupport/lib
parent601778e38af53c66d604fe31a3b84ba84d973511 (diff)
downloadrails-4685fa0c20fbf3e78eaad94756e0f4a644447a10.tar.gz
rails-4685fa0c20fbf3e78eaad94756e0f4a644447a10.tar.bz2
rails-4685fa0c20fbf3e78eaad94756e0f4a644447a10.zip
String#to_time overflows to DateTime. Add String#to_datetime. Closes #8572.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6935 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/string/conversions.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/conversions.rb b/activesupport/lib/active_support/core_ext/string/conversions.rb
index cfb767d1f9..096778e26f 100644
--- a/activesupport/lib/active_support/core_ext/string/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/string/conversions.rb
@@ -7,12 +7,16 @@ module ActiveSupport #:nodoc:
module Conversions
# Form can be either :utc (default) or :local.
def to_time(form = :utc)
- ::Time.send(form, *ParseDate.parsedate(self))
+ ::Time.send("#{form}_time", *ParseDate.parsedate(self)[0..5].map {|arg| arg || 0})
end
def to_date
::Date.new(*ParseDate.parsedate(self)[0..2])
end
+
+ def to_datetime
+ ::DateTime.civil(*ParseDate.parsedate(self)[0..5].map {|arg| arg || 0} << 0 << 0)
+ end
end
end
end