diff options
author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-12-17 12:00:32 +1100 |
---|---|---|
committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-12-17 12:00:32 +1100 |
commit | 418639b4cfe477d7309fa53e8b8e2472b44bda80 (patch) | |
tree | 1ffcf8e58a2d8c53311f90970c566f258d18cdd0 /actionmailer/lib/action_mailer/base.rb | |
parent | 186cd7bc530f705b889c27f3680ab48c7c10a6f3 (diff) | |
download | rails-418639b4cfe477d7309fa53e8b8e2472b44bda80.tar.gz rails-418639b4cfe477d7309fa53e8b8e2472b44bda80.tar.bz2 rails-418639b4cfe477d7309fa53e8b8e2472b44bda80.zip |
Fixes for working with 1.9.1-head
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 24064b3a74..ab00bbba3c 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -258,7 +258,6 @@ module ActionMailer #:nodoc: include AbstractController::Layouts include AbstractController::Helpers - helper ActionMailer::MailHelper if Object.const_defined?(:ActionController) include ActionController::UrlWriter |