diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-06-04 18:25:03 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-06-05 18:27:27 -0700 |
| commit | a838ba392ea84b125dff01717796958a4491fa7b (patch) | |
| tree | 17f08aa11522716651fe53f48a51b706285b384c /actionmailer/lib | |
| parent | d6e4113c83a9d55be6f2af247da2cecaa855f43b (diff) | |
| download | rails-a838ba392ea84b125dff01717796958a4491fa7b.tar.gz rails-a838ba392ea84b125dff01717796958a4491fa7b.tar.bz2 rails-a838ba392ea84b125dff01717796958a4491fa7b.zip | |
Prefer sibling action_controller
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer.rb | 13 |
1 files changed, 3 insertions, 10 deletions
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 |