diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-07-07 22:11:20 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-07-07 22:11:20 +0200 |
| commit | 062cbd18ddbf6ef48c9a9a2a69081737aebbee89 (patch) | |
| tree | 0d34b865c1852c015e1cd1cd413dcf3aefe6fc41 /actionmailer/lib/action_mailer/message_delivery.rb | |
| parent | 1b4399dfe7eaa8dd2a75f35815ea429962c51a29 (diff) | |
| download | rails-062cbd18ddbf6ef48c9a9a2a69081737aebbee89.tar.gz rails-062cbd18ddbf6ef48c9a9a2a69081737aebbee89.tar.bz2 rails-062cbd18ddbf6ef48c9a9a2a69081737aebbee89.zip | |
Revert "Merge pull request #20758 from xijo/action_mailer_message_delivery_respects_i18n_locale"
This reverts commit f2a8c23654d69dd8f294971487b5abf0e5d891c3, reversing
changes made to 3046c9bbe154aa717a5147091be8b495ed8969c4.
Diffstat (limited to 'actionmailer/lib/action_mailer/message_delivery.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/message_delivery.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/message_delivery.rb b/actionmailer/lib/action_mailer/message_delivery.rb index c2479bf651..ff2cb0fd01 100644 --- a/actionmailer/lib/action_mailer/message_delivery.rb +++ b/actionmailer/lib/action_mailer/message_delivery.rb @@ -87,7 +87,7 @@ module ActionMailer private def enqueue_delivery(delivery_method, options={}) - args = @mailer.name, @mail_method.to_s, delivery_method.to_s, I18n.locale.to_s, *@args + args = @mailer.name, @mail_method.to_s, delivery_method.to_s, *@args ActionMailer::DeliveryJob.set(options).perform_later(*args) end end |