diff options
| author | rick <technoweenie@gmail.com> | 2008-08-26 11:53:33 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-08-26 11:53:33 -0700 |
| commit | 0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2 (patch) | |
| tree | 1a782151632dd80c8a18c3960536bdf8643debe3 /actionpack/lib/action_view/template_handlers/builder.rb | |
| parent | 0a6d75dedd79407376aae1f01302164dfd3e44b6 (diff) | |
| parent | 229eedfda87a7706dbb5e3e51af8707b3adae375 (diff) | |
| download | rails-0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2.tar.gz rails-0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2.tar.bz2 rails-0aef9d1a2651fa0acd2adcd2de308eeb0ec8cdd2.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_view/template_handlers/builder.rb')
| -rw-r--r-- | actionpack/lib/action_view/template_handlers/builder.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/action_view/template_handlers/builder.rb b/actionpack/lib/action_view/template_handlers/builder.rb index cbe53e11d8..7d24a5c423 100644 --- a/actionpack/lib/action_view/template_handlers/builder.rb +++ b/actionpack/lib/action_view/template_handlers/builder.rb @@ -6,18 +6,12 @@ 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 + ";xml.target!;" end - - def cache_fragment(block, name = {}, options = nil) - @view.fragment_for(block, name, options) do - eval('xml.target!', block.binding) - end - end end end end |