aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-04-29 18:10:14 +0000
committerMarcel Molina <marcel@vernix.org>2006-04-29 18:10:14 +0000
commit61864909628f5ac2f20d3337e0274dab016ac7c5 (patch)
tree86a8cc11110b1009f23fe0c72a6138f8ac45d31a /activesupport/lib
parentdf26041c8990d4a0276e7a4c77cc771ac38e176e (diff)
downloadrails-61864909628f5ac2f20d3337e0274dab016ac7c5.tar.gz
rails-61864909628f5ac2f20d3337e0274dab016ac7c5.tar.bz2
rails-61864909628f5ac2f20d3337e0274dab016ac7c5.zip
Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4310 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/core_ext/time/conversions.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index be8dc0e76f..c141d082e2 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -13,8 +13,7 @@ module ActiveSupport #:nodoc:
:rfc822 => "%a, %d %b %Y %H:%M:%S %z"
}
- def self.append_features(klass)
- super
+ def self.included(klass)
klass.send(:alias_method, :to_default_s, :to_s)
klass.send(:alias_method, :to_s, :to_formatted_s)
end