aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/components.rb
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-04-29 20:20:22 +0000
committerMarcel Molina <marcel@vernix.org>2006-04-29 20:20:22 +0000
commit9f92dd39849c353b8a69401a93ba7b13f93d669f (patch)
tree115190ab4023a28f8dff3e54b42fa1c981bc7d14 /actionpack/lib/action_controller/components.rb
parent995167ec2eced73f44d4f961349dbbee6b297210 (diff)
downloadrails-9f92dd39849c353b8a69401a93ba7b13f93d669f.tar.gz
rails-9f92dd39849c353b8a69401a93ba7b13f93d669f.tar.bz2
rails-9f92dd39849c353b8a69401a93ba7b13f93d669f.zip
Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4312 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/components.rb')
-rw-r--r--actionpack/lib/action_controller/components.rb11
1 files changed, 3 insertions, 8 deletions
diff --git a/actionpack/lib/action_controller/components.rb b/actionpack/lib/action_controller/components.rb
index 75005daaec..c746928697 100644
--- a/actionpack/lib/action_controller/components.rb
+++ b/actionpack/lib/action_controller/components.rb
@@ -50,14 +50,9 @@ module ActionController #:nodoc:
base.send :attr_accessor, :parent_controller
base.class_eval do
- alias_method :process_cleanup_without_components, :process_cleanup
- alias_method :process_cleanup, :process_cleanup_with_components
-
- alias_method :set_session_options_without_components, :set_session_options
- alias_method :set_session_options, :set_session_options_with_components
-
- alias_method :flash_without_components, :flash
- alias_method :flash, :flash_with_components
+ alias_method_chain :process_cleanup, :components
+ alias_method_chain :set_session_options, :components
+ alias_method_chain :flash, :components
alias_method :component_request?, :parent_controller
end