diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-13 16:27:36 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-13 16:27:36 +0000 |
| commit | 51f9c931ea47034bcedd5196a783262a4530386d (patch) | |
| tree | 3d0314ca8678e6a45b745c771c1870dd26d3cddb /actionpack/lib | |
| parent | ee6882614f46c33277c36504d125672bb8f6c34e (diff) | |
| download | rails-51f9c931ea47034bcedd5196a783262a4530386d.tar.gz rails-51f9c931ea47034bcedd5196a783262a4530386d.tar.bz2 rails-51f9c931ea47034bcedd5196a783262a4530386d.zip | |
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
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/partials.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/partials.rb b/actionpack/lib/action_view/partials.rb index fa12067c82..35691aaf81 100644 --- a/actionpack/lib/action_view/partials.rb +++ b/actionpack/lib/action_view/partials.rb @@ -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 |