diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-12-17 12:23:08 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-12-17 12:23:08 +1100 |
| commit | 63b124b043dec036403f9a88aeafdf99669064e0 (patch) | |
| tree | 6eae80842608d223f0eebae957dab1b8822555c8 /actionmailer/lib/action_mailer/base.rb | |
| parent | 418639b4cfe477d7309fa53e8b8e2472b44bda80 (diff) | |
| download | rails-63b124b043dec036403f9a88aeafdf99669064e0.tar.gz rails-63b124b043dec036403f9a88aeafdf99669064e0.tar.bz2 rails-63b124b043dec036403f9a88aeafdf99669064e0.zip | |
Merged in latest changes from rails/master
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index ab00bbba3c..9862c2265b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -258,7 +258,8 @@ module ActionMailer #:nodoc: include AbstractController::Layouts include AbstractController::Helpers - + helper ActionMailer::MailHelper + if Object.const_defined?(:ActionController) include ActionController::UrlWriter end |