aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-02-21 23:55:56 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2012-02-22 11:13:02 -0200
commit19433ce8701d9ff2b311d0a2ec98be366ce461ea (patch)
treea2acdc41ab925c64d98b7944b3ff2d3928bb2412 /actionmailer/lib
parent35626feb61e260ec704ed407768da4c6a2f27a47 (diff)
downloadrails-19433ce8701d9ff2b311d0a2ec98be366ce461ea.tar.gz
rails-19433ce8701d9ff2b311d0a2ec98be366ce461ea.tar.bz2
rails-19433ce8701d9ff2b311d0a2ec98be366ce461ea.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/lib')
-rw-r--r--actionmailer/lib/action_mailer/collector.rb4
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