diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-17 19:04:47 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-17 19:04:47 +0000 |
| commit | 0aad5abcc8f3893dd0664b0813fa6815f7e43527 (patch) | |
| tree | 58dda47f27506dcdd04393d6a79a4efa90479075 /actionmailer | |
| parent | 02e382a765bea5632e56d80408ba20762e3ef334 (diff) | |
| download | rails-0aad5abcc8f3893dd0664b0813fa6815f7e43527.tar.gz rails-0aad5abcc8f3893dd0664b0813fa6815f7e43527.tar.bz2 rails-0aad5abcc8f3893dd0664b0813fa6815f7e43527.zip | |
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
Diffstat (limited to 'actionmailer')
| -rwxr-xr-x | actionmailer/lib/action_mailer.rb | 9 |
1 files changed, 6 insertions, 3 deletions
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/") |