aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-03-31 02:18:17 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-03-31 02:18:17 +0000
commit047db112991785d871e9a6ba165b93752b0fff06 (patch)
tree0dc3655218bded22c1380ba0b98e93dad3ad9417
parentc52771e7a022a45f2b70bfc8f29b02d008fb9b15 (diff)
downloadrails-047db112991785d871e9a6ba165b93752b0fff06.tar.gz
rails-047db112991785d871e9a6ba165b93752b0fff06.tar.bz2
rails-047db112991785d871e9a6ba165b93752b0fff06.zip
Fine, warn. Just don't recurse to death in cc.rb
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9161 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/conversions.rb2
1 files changed, 1 insertions, 1 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 7f13873e7f..c86a527045 100644
--- a/activesupport/lib/active_support/core_ext/date_time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/date_time/conversions.rb
@@ -5,7 +5,7 @@ module ActiveSupport #:nodoc:
module Conversions
def self.included(base) #:nodoc:
base.class_eval do
- alias_method :to_default_s, :to_s
+ alias_method :to_default_s, :to_s if instance_methods.include?(:to_s)
alias_method :to_s, :to_formatted_s
alias_method :default_inspect, :inspect
alias_method :inspect, :readable_inspect