diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-05-02 11:30:10 +1000 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-05-02 11:56:08 +0200 |
| commit | 08b07b60b6d91a2f7bba5eec1e9b1d26599c578a (patch) | |
| tree | b315e94b226abd7485c6e52260a0f70213cbd5e2 /actionmailer/lib | |
| parent | 256a15c23581865559cc758c2e377cd395cc05b3 (diff) | |
| download | rails-08b07b60b6d91a2f7bba5eec1e9b1d26599c578a.tar.gz rails-08b07b60b6d91a2f7bba5eec1e9b1d26599c578a.tar.bz2 rails-08b07b60b6d91a2f7bba5eec1e9b1d26599c578a.zip | |
Adding ability to pass proc's to the ActionMailer class default method
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index e566132f4e..3a49da5984 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -528,8 +528,13 @@ module ActionMailer #:nodoc: content_type = headers[:content_type] parts_order = headers[:parts_order] + # Call all the procs (if any) + default_values = self.class.default.merge(self.class.default) do |k,v| + v.respond_to?(:call) ? v.call : v + end + # Handle defaults - headers = headers.reverse_merge(self.class.default) + headers = headers.reverse_merge(default_values) headers[:subject] ||= default_i18n_subject # Apply charset at the beginning so all fields are properly quoted |