diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-04-29 18:10:14 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-04-29 18:10:14 +0000 |
| commit | 61864909628f5ac2f20d3337e0274dab016ac7c5 (patch) | |
| tree | 86a8cc11110b1009f23fe0c72a6138f8ac45d31a /actionmailer | |
| parent | df26041c8990d4a0276e7a4c77cc771ac38e176e (diff) | |
| download | rails-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 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 4 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/adv_attr_accessor.rb | 3 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/helpers.rb | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index f864dc92e3..bf23f7b4dd 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,3 +1,7 @@ +*SVN* + +* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.] + * Correct spurious documentation example code which results in a SyntaxError. [Marcel Molina Jr.] *1.2.1* (April 6th, 2006) diff --git a/actionmailer/lib/action_mailer/adv_attr_accessor.rb b/actionmailer/lib/action_mailer/adv_attr_accessor.rb index 50afe4d742..cfd723011a 100644 --- a/actionmailer/lib/action_mailer/adv_attr_accessor.rb +++ b/actionmailer/lib/action_mailer/adv_attr_accessor.rb @@ -1,7 +1,6 @@ module ActionMailer module AdvAttrAccessor #:nodoc: - def self.append_features(base) - super + def self.included(base) base.extend(ClassMethods) end diff --git a/actionmailer/lib/action_mailer/helpers.rb b/actionmailer/lib/action_mailer/helpers.rb index b53326ca72..ee7523a507 100644 --- a/actionmailer/lib/action_mailer/helpers.rb +++ b/actionmailer/lib/action_mailer/helpers.rb @@ -1,8 +1,6 @@ module ActionMailer module Helpers #:nodoc: - def self.append_features(base) #:nodoc: - super - + def self.included(base) #:nodoc: # Initialize the base module to aggregate its helpers. base.class_inheritable_accessor :master_helper_module base.master_helper_module = Module.new |