diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-24 15:08:06 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-24 15:08:06 +0100 |
| commit | 6545a68264682e8d0a0ee0e913fa98d92fef9428 (patch) | |
| tree | 8bffb69c52970ad72ab0f35de9acf5ef3db4257e /actionmailer/lib/action_mailer | |
| parent | 84ebfa4550b2325c6c89bc13aa6f904ff88d0db7 (diff) | |
| download | rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.tar.gz rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.tar.bz2 rails-6545a68264682e8d0a0ee0e913fa98d92fef9428.zip | |
Fix failing tests after merge.
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/mail_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb index 701dc34431..df71330fd5 100644 --- a/actionmailer/lib/action_mailer/mail_helper.rb +++ b/actionmailer/lib/action_mailer/mail_helper.rb @@ -18,7 +18,7 @@ module ActionMailer # Access the mailer instance. def mailer #:nodoc: - @controller + @_controller end end end |