diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2012-09-06 03:36:19 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2012-09-06 03:36:19 -0700 |
| commit | 3c27dcc639a9380ff86c76ed6ed089a072d64df0 (patch) | |
| tree | 3c958bf72c6808ed1fcba08f7760c01dfcb035bc /actionmailer/lib/action_mailer/base.rb | |
| parent | 4fa2f10494260c0937ffe066aace09747e57d7c7 (diff) | |
| parent | 8fc8763fde2cc685ed63fcf640cfae556252809b (diff) | |
| download | rails-3c27dcc639a9380ff86c76ed6ed089a072d64df0.tar.gz rails-3c27dcc639a9380ff86c76ed6ed089a072d64df0.tar.bz2 rails-3c27dcc639a9380ff86c76ed6ed089a072d64df0.zip | |
Merge pull request #7397 from asanghi/master
Allow delivery method options to be set per mail instance
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index f5c325179f..4a099553c0 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -683,7 +683,7 @@ module ActionMailer #:nodoc: m.charset = charset = headers[:charset] # Set configure delivery behavior - wrap_delivery_behavior!(headers.delete(:delivery_method)) + wrap_delivery_behavior!(headers.delete(:delivery_method),headers.delete(:delivery_method_options)) # Assign all headers except parts_order, content_type and body assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path) |