diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-15 11:59:28 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-15 11:59:28 -0700 |
| commit | 5314abed182450dbdcc25ebe601a2bbdf4cb926f (patch) | |
| tree | 83d98fc8fa038ca525aecf4c4d293ae678ff2e99 /actionpack/lib/action_controller | |
| parent | 80d1e2778860d1825d749aad274e70e0ea810bc6 (diff) | |
| download | rails-5314abed182450dbdcc25ebe601a2bbdf4cb926f.tar.gz rails-5314abed182450dbdcc25ebe601a2bbdf4cb926f.tar.bz2 rails-5314abed182450dbdcc25ebe601a2bbdf4cb926f.zip | |
Keep ActionMailer using the old layouts code until it gets refactored.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/old_base/layout.rb | 8 |
1 files changed, 8 insertions, 0 deletions
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) |