diff options
| author | José Valim <jose.valim@gmail.com> | 2012-08-07 13:59:31 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-08-07 14:00:54 -0300 |
| commit | 485e655082c4ddbcde7788b3eac4bb8281b37d27 (patch) | |
| tree | 0e1001009001d66a13a685d2a3097099e8b7bbe4 /actionmailer/lib/action_mailer/base.rb | |
| parent | 666d3fd0c156a5c47eeddfe87dc466863890ba70 (diff) | |
| download | rails-485e655082c4ddbcde7788b3eac4bb8281b37d27.tar.gz rails-485e655082c4ddbcde7788b3eac4bb8281b37d27.tar.bz2 rails-485e655082c4ddbcde7788b3eac4bb8281b37d27.zip | |
Revert "Merge pull request #7202 from asanghi/perform_deliveries_in_mail"
Reverting because it feels backward to specify a delivery to not
be performed while the e-mail is being composed. It is simpler (and
makes more sense) to delegate the responsibility to the calling code.
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 73ac8ea12b..900da9697e 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),headers.delete(:perform_deliveries)) + wrap_delivery_behavior!(headers.delete(:delivery_method)) # Assign all headers except parts_order, content_type and body assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path) |