Skip to content
Browse files

apply [6543] to edge. Closes #5044 [tpope]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6545 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent c87d242 commit eb7a3045e3035d7de35a43297a4f36255e4f178d @technoweenie technoweenie committed Apr 20, 2007
View
2 actionpack/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Return the string representation from an Xml Builder when rendering a partial. Closes #5044 [tpope]
+
* Fixed that parameters from XML should also be presented in a hash with indifferent access [DHH]
* Tweak template format rules so that the ACCEPT header is only used if it's text/javascript. This is so ajax actions without a :format param get recognized as Mime::JS. [Rick]
View
3 actionpack/lib/action_view/base.rb
@@ -526,7 +526,8 @@ def create_template_source(extension, template, render_symbol, locals)
when :rxml, :builder
"controller.response.content_type ||= Mime::XML\n" +
"xml = Builder::XmlMarkup.new(:indent => 2)\n" +
- template
+ template +
+ "\nxml.target!\n"
when :rjs
"controller.response.content_type ||= Mime::JS\n" +
"update_page do |page|\n#{template}\nend"
View
3 actionpack/test/fixtures/test/hello_world.builder
@@ -1,3 +1,4 @@
xml.html do
xml.p "Hello"
-end
+end
+"String return value"

0 comments on commit eb7a304

Please sign in to comment.
Something went wrong with that request. Please try again.