aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/mail_helper.rb
diff options
context:
space:
mode:
authorYehuda Katz <wycats@Yehuda-Katz.local>2009-12-25 13:06:11 -0800
committerYehuda Katz <wycats@Yehuda-Katz.local>2009-12-25 13:06:11 -0800
commit8f6da9483b28ec82e4577bf4cbe5209e2c750c84 (patch)
tree4c52a09b3268ff90dae12f8bc525f0b2f3acbace /actionmailer/lib/action_mailer/mail_helper.rb
parent2e79ec71a542c2d2e7bedbe12eda0b5e177fb0e0 (diff)
parent9f1c359a201bfacff7b89cd1e8579bc1bdf541e2 (diff)
downloadrails-8f6da9483b28ec82e4577bf4cbe5209e2c750c84.tar.gz
rails-8f6da9483b28ec82e4577bf4cbe5209e2c750c84.tar.bz2
rails-8f6da9483b28ec82e4577bf4cbe5209e2c750c84.zip
Merge remote branch 'jose/am'
Diffstat (limited to 'actionmailer/lib/action_mailer/mail_helper.rb')
-rw-r--r--actionmailer/lib/action_mailer/mail_helper.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb
index 9aa178cdef..a1dec68c5d 100644
--- a/actionmailer/lib/action_mailer/mail_helper.rb
+++ b/actionmailer/lib/action_mailer/mail_helper.rb
@@ -15,5 +15,10 @@ module ActionMailer
formatted
end
+
+ # Access the mailer instance.
+ def mailer #:nodoc:
+ @controller
+ end
end
end \ No newline at end of file