From 3c15cba17519e7a4acc3958662f8f3693837c179 Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Mon, 15 Jun 2009 17:32:10 -0700 Subject: Whoops, I guess we broke layouts ;) --- actionpack/lib/action_controller/abstract/layouts.rb | 6 ++++++ actionpack/lib/action_controller/base/base.rb | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/abstract/layouts.rb b/actionpack/lib/action_controller/abstract/layouts.rb index 9ff8e9beb1..2ac4e6068a 100644 --- a/actionpack/lib/action_controller/abstract/layouts.rb +++ b/actionpack/lib/action_controller/abstract/layouts.rb @@ -9,6 +9,11 @@ module AbstractController end module ClassMethods + def inherited(klass) + super + klass._write_layout_method + end + # Specify the layout to use for this class. # # If the specified layout is a: @@ -78,6 +83,7 @@ module AbstractController end ruby_eval end + self.class_eval { private :_layout } end end diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb index e8fc153578..e541d24e31 100644 --- a/actionpack/lib/action_controller/base/base.rb +++ b/actionpack/lib/action_controller/base/base.rb @@ -71,12 +71,6 @@ module ActionController @subclasses ||= [] end - def self.app_loaded! - @subclasses.each do |subclass| - subclass.constantize._write_layout_method - end - end - def _normalize_options(action = nil, options = {}, &blk) if action.is_a?(Hash) options, action = action, nil -- cgit v1.2.3