From 0aad5abcc8f3893dd0664b0813fa6815f7e43527 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Thu, 17 Feb 2005 19:04:47 +0000 Subject: AR, AP, and AM should look for AS in sibling directory before trying RubyGems #648 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@648 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/lib/action_mailer.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'actionmailer/lib/action_mailer.rb') diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index 48fe4ccb16..a8157824ef 100755 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -24,9 +24,12 @@ begin require 'action_controller' rescue LoadError - # Action Pack is not already available, try RubyGems - require 'rubygems' - require_gem 'actionpack', '>= 0.9.0' + begin + require File.dirname(__FILE__) + '/../../actionpack/lib/action_controller' + rescue LoadError + require 'rubygems' + require_gem 'actionpack', '>= 0.9.0' + end end $:.unshift(File.dirname(__FILE__) + "/action_mailer/vendor/") -- cgit v1.2.3