diff options
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 | ||||
| -rw-r--r-- | actionpack/Rakefile | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/old_base/layout.rb | 8 |
4 files changed, 13 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index a33302a222..8054d78a90 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -1,4 +1,6 @@ require "active_support/core_ext/class" +# Use the old layouts until actionmailer gets refactored +require "action_controller/old_base/layout" module ActionMailer #:nodoc: # Action Mailer allows you to send email from your application using a mailer model and views. @@ -250,7 +252,7 @@ module ActionMailer #:nodoc: include AdvAttrAccessor, PartContainer, Quoting, Utils if Object.const_defined?(:ActionController) include ActionController::UrlWriter - include ActionController::Layouts + include ActionController::Layout end private_class_method :new #:nodoc: diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 53387d305c..142c72ce6b 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -22,7 +22,7 @@ task :default => [ :test ] # Run the unit tests desc "Run all unit tests" -task :test => [:test_action_pack, :test_active_record_integration, :test_new_base, :test_new_base_on_old_tests] +task :test => [:test_action_pack, :test_active_record_integration, :test_new_base] test_lib_dirs = ENV["NEW"] ? ["test/new_base"] : [] test_lib_dirs.push "test", "test/lib" diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index 44724fc9cb..8e5e5736ab 100644 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -42,6 +42,7 @@ module ActionController end autoload :HTML, 'action_controller/vendor/html-scanner' +autoload :AbstractController, 'action_controller/abstract' require 'action_dispatch' require 'action_view' 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) |