From 5314abed182450dbdcc25ebe601a2bbdf4cb926f Mon Sep 17 00:00:00 2001 From: Yehuda Katz + Carl Lerche Date: Mon, 15 Jun 2009 11:59:28 -0700 Subject: Keep ActionMailer using the old layouts code until it gets refactored. --- actionpack/lib/action_controller/old_base/layout.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'actionpack/lib/action_controller') diff --git a/actionpack/lib/action_controller/old_base/layout.rb b/actionpack/lib/action_controller/old_base/layout.rb index cf5f46a32b..3046e082d9 100644 --- a/actionpack/lib/action_controller/old_base/layout.rb +++ b/actionpack/lib/action_controller/old_base/layout.rb @@ -1,8 +1,16 @@ require 'active_support/core_ext/enumerable' +require 'active_support/core_ext/class' require 'active_support/core_ext/class/delegating_attributes' require 'active_support/core_ext/class/inheritable_attributes' module ActionController #:nodoc: + # MegasuperultraHAX + # plz refactor ActionMailer + class Base + @@exempt_from_layout = [ActionView::TemplateHandlers::RJS] + cattr_accessor :exempt_from_layout + end + module Layout #:nodoc: def self.included(base) base.extend(ClassMethods) -- cgit v1.2.3