aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/layout.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/layout.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/layout.rb')
-rw-r--r--actionpack/lib/action_controller/layout.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb
index 4e9e42d468..f27e42ea17 100644
--- a/actionpack/lib/action_controller/layout.rb
+++ b/actionpack/lib/action_controller/layout.rb
@@ -3,12 +3,13 @@ module ActionController #:nodoc:
def self.included(base)
base.extend(ClassMethods)
base.class_eval do
+ # NOTE: Can't use alias_method_chain here because +render_without_layout+ is already
+ # defined as a publicly exposed method
alias_method :render_with_no_layout, :render
alias_method :render, :render_with_a_layout
class << self
- alias_method :inherited_without_layout, :inherited
- alias_method :inherited, :inherited_with_layout
+ alias_method_chain :inherited, :layout
end
end
end