mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fixed that render_partial_collection should always return a string (and not sometimes an array, despite <%= %> not caring)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1302 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
ee6882614f
commit
51f9c931ea
2 changed files with 4 additions and 1 deletions
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Fixed that render_partial_collection should always return a string (and not sometimes an array, despite <%= %> not caring)
|
||||
|
||||
* Added TextHelper#sanitize that can will remove any Javascript handlers, blocks, and forms from an input of HTML. This allows for use of HTML on public sites, but still be free of XSS issues. #1277 [Jamis Buck]
|
||||
|
||||
* Fixed the HTML scanner used by assert_tag where a infinite loop could be caused by a stray less-than sign in the input #1270 [Jamis Buck]
|
||||
|
|
|
@ -59,11 +59,12 @@ module ActionView
|
|||
end
|
||||
|
||||
return nil if collection_of_partials.empty?
|
||||
|
||||
if partial_spacer_template
|
||||
spacer_path, spacer_name = partial_pieces(partial_spacer_template)
|
||||
collection_of_partials.join(render("#{spacer_path}/_#{spacer_name}"))
|
||||
else
|
||||
collection_of_partials
|
||||
collection_of_partials.join
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue