aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/time
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-05-07 18:39:03 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-05-07 18:39:03 -0700
commit4817bf94d135c44ddfae1a30acb15de989e3c86c (patch)
treed64f3a7ffb205d53ae4bbfe37ad0453e99148f36 /activesupport/lib/active_support/core_ext/time
parent49ed45213607ed6ce7e6c13c319bf55f916a0ac4 (diff)
downloadrails-4817bf94d135c44ddfae1a30acb15de989e3c86c.tar.gz
rails-4817bf94d135c44ddfae1a30acb15de989e3c86c.tar.bz2
rails-4817bf94d135c44ddfae1a30acb15de989e3c86c.zip
Check for date/time methods that moved upstream in 1.9
Diffstat (limited to 'activesupport/lib/active_support/core_ext/time')
-rw-r--r--activesupport/lib/active_support/core_ext/time/conversions.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index 94e01597a9..6d9c080442 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -69,7 +69,7 @@ class Time
# In this case, it simply returns +self+.
def to_time
self
- end
+ end unless method_defined?(:to_time)
# Converts a Time instance to a Ruby DateTime instance, preserving UTC offset.
#