diff options
| author | Aditya Sanghi <asanghi@me.com> | 2012-07-30 23:57:20 +0530 |
|---|---|---|
| committer | Aditya Sanghi <asanghi@me.com> | 2012-07-30 23:57:20 +0530 |
| commit | 7c8424e057b53cf12ce1c748b09601e720be6a09 (patch) | |
| tree | da3aa256add354a3a23f2461ac494d8ecb102a99 /actionmailer/lib/action_mailer/base.rb | |
| parent | 4ac81de52fbcdabc68f6d1fa8a5ee9ff7fff7df1 (diff) | |
| download | rails-7c8424e057b53cf12ce1c748b09601e720be6a09.tar.gz rails-7c8424e057b53cf12ce1c748b09601e720be6a09.tar.bz2 rails-7c8424e057b53cf12ce1c748b09601e720be6a09.zip | |
allow perform deliveries to be set within mailer action
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 150d435140..f0b1fcbe63 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -684,7 +684,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(:perform_deliveries)) # Assign all headers except parts_order, content_type and body assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path) |