diff options
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/") |