diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-21 23:55:56 -0200 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-02-22 11:12:03 -0200 |
commit | 157ea763060e90f3aba0ff5af15d5dcb0f0c9c35 (patch) | |
tree | 5d2a3cb89c5f29f74419c42cdd7482891be56ea1 /actionmailer | |
parent | a95f730ea45f01744702849fc084b4d28c857964 (diff) | |
download | rails-157ea763060e90f3aba0ff5af15d5dcb0f0c9c35.tar.gz rails-157ea763060e90f3aba0ff5af15d5dcb0f0c9c35.tar.bz2 rails-157ea763060e90f3aba0ff5af15d5dcb0f0c9c35.zip |
format lookup for partials is derived from the format in which the template is being rendered
Closes #5025 part 2
Diffstat (limited to 'actionmailer')
-rw-r--r-- | actionmailer/lib/action_mailer/collector.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/collector.rb b/actionmailer/lib/action_mailer/collector.rb index d03e085e83..17b22aea2a 100644 --- a/actionmailer/lib/action_mailer/collector.rb +++ b/actionmailer/lib/action_mailer/collector.rb @@ -22,9 +22,9 @@ module ActionMailer #:nodoc: def custom(mime, options={}) options.reverse_merge!(:content_type => mime.to_s) - @context.freeze_formats([mime.to_sym]) + @context.formats = [mime.to_sym] options[:body] = block_given? ? yield : @default_render.call @responses << options end end -end
\ No newline at end of file +end |