From a838ba392ea84b125dff01717796958a4491fa7b Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 4 Jun 2009 18:25:03 -0700
Subject: Prefer sibling action_controller

---
 actionmailer/lib/action_mailer.rb | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'actionmailer/lib')

diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 02c536c8ad..a427376579 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -21,16 +21,9 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-begin
-  require 'action_controller'
-rescue LoadError
-  actionpack_path = "#{File.dirname(__FILE__)}/../../actionpack/lib"
-  if File.directory?(actionpack_path)
-    $:.unshift actionpack_path
-    require 'action_controller'
-  end
-end
-
+actionpack_path = "#{File.dirname(__FILE__)}/../../actionpack/lib"
+$:.unshift(actionpack_path) if File.directory?(actionpack_path)
+require 'action_controller'
 require 'action_view'
 
 module ActionMailer
-- 
cgit v1.2.3