aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/template_handlers/builder.rb
diff options
context:
space:
mode:
authorTom Ward <tom@popdog.net>2008-07-18 20:14:12 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-18 20:14:12 -0500
commitc3d1fda555c4bd5f8821d830c685ae5d0e7e52d0 (patch)
tree41a5e9b018d724a82c33ab117bc1e6403e6cbbc5 /actionpack/lib/action_view/template_handlers/builder.rb
parentd2ccb852d4e1f6f1b01e43f32213053ae3bef408 (diff)
downloadrails-c3d1fda555c4bd5f8821d830c685ae5d0e7e52d0.tar.gz
rails-c3d1fda555c4bd5f8821d830c685ae5d0e7e52d0.tar.bz2
rails-c3d1fda555c4bd5f8821d830c685ae5d0e7e52d0.zip
Set the response content type to that of found template if not explicitly set elsewhere [#444 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/lib/action_view/template_handlers/builder.rb')
-rw-r--r--actionpack/lib/action_view/template_handlers/builder.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/template_handlers/builder.rb b/actionpack/lib/action_view/template_handlers/builder.rb
index 335ec1abb4..7d24a5c423 100644
--- a/actionpack/lib/action_view/template_handlers/builder.rb
+++ b/actionpack/lib/action_view/template_handlers/builder.rb
@@ -6,8 +6,7 @@ module ActionView
include Compilable
def compile(template)
- # ActionMailer does not have a response
- "controller.respond_to?(:response) && controller.response.content_type ||= Mime::XML;" +
+ "set_controller_content_type(Mime::XML);" +
"xml = ::Builder::XmlMarkup.new(:indent => 2);" +
"self.output_buffer = xml.target!;" +
template.source +