From 759183c822240ee0a550f1f5a556ffc314b68099 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 25 Nov 2008 10:38:20 -0600
Subject: Ensure ActionView will be available to ActionMailer if
 ActionController is not loaded

---
 actionpack/lib/action_controller.rb      | 2 ++
 actionpack/lib/action_controller/base.rb | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 62d75a47ec..a7a7d932c4 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -100,3 +100,5 @@ autoload :Mime, 'action_controller/mime_type'
 
 autoload :HTML, 'action_controller/vendor/html-scanner'
 autoload :Rack, 'action_controller/vendor/rack'
+
+require 'action_view'
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 041ff62a74..7e38f95076 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1,4 +1,3 @@
-require 'action_view'
 require 'set'
 
 module ActionController #:nodoc:
-- 
cgit v1.2.3