aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-09-11 03:24:50 -0500
committerwycats <wycats@gmail.com>2010-09-11 03:24:50 -0500
commitf6153f74da29f56017d5ddb8a2b8869d9b5835d7 (patch)
tree39de2f1a37cc755ed0e0950c012b47c61427bf83 /actionmailer
parent477df63433d8543ae8568de149e70d1bf1b41bb8 (diff)
parent497b6af8818f656fdbca9ed2470c1c16ae5ff1cd (diff)
downloadrails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.gz
rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.tar.bz2
rails-f6153f74da29f56017d5ddb8a2b8869d9b5835d7.zip
Merge remote branch 'drogus/engines'
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/railtie.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index a2b00addc9..889ae34407 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -21,7 +21,7 @@ module ActionMailer
ActiveSupport.on_load(:action_mailer) do
include AbstractController::UrlFor
extend ::AbstractController::Railties::RoutesHelpers.with(app.routes)
- include app.routes.mounted_helpers(:app)
+ include app.routes.mounted_helpers
options.each { |k,v| send("#{k}=", v) }
end
end