Permalink
Browse files

Keep ActionMailer using the old layouts code until it gets refactored.

  • Loading branch information...
Yehuda Katz + Carl Lerche
Yehuda Katz + Carl Lerche committed Jun 15, 2009
1 parent 80d1e27 commit 5314abed182450dbdcc25ebe601a2bbdf4cb926f
@@ -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 @@ class Base
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:
View
@@ -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"
@@ -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'
@@ -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)

0 comments on commit 5314abe

Please sign in to comment.