diff options
| author | rick <technoweenie@gmail.com> | 2008-07-16 14:20:15 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-07-16 14:20:15 -0700 |
| commit | 0a6d75dedd79407376aae1f01302164dfd3e44b6 (patch) | |
| tree | dfef7e73b3b19a65895651c82cb6e0b727394eab /actionpack/lib/action_view/template_handlers/builder.rb | |
| parent | a14cedc7797aef4ccd9da46ed73e36d730392814 (diff) | |
| parent | fc89a951933638b051bb1f9e1339ee6ae7c94cda (diff) | |
| download | rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.tar.gz rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.tar.bz2 rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.zip | |
merge with local tweaks
Diffstat (limited to 'actionpack/lib/action_view/template_handlers/builder.rb')
| -rw-r--r-- | actionpack/lib/action_view/template_handlers/builder.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/template_handlers/builder.rb b/actionpack/lib/action_view/template_handlers/builder.rb index 2d413490bd..cbe53e11d8 100644 --- a/actionpack/lib/action_view/template_handlers/builder.rb +++ b/actionpack/lib/action_view/template_handlers/builder.rb @@ -6,7 +6,8 @@ module ActionView include Compilable def compile(template) - "controller.response.content_type ||= Mime::XML;" + + # ActionMailer does not have a response + "controller.respond_to?(:response) && controller.response.content_type ||= Mime::XML;" + "xml = ::Builder::XmlMarkup.new(:indent => 2);" + template.source + ";xml.target!;" |