diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-02-01 23:42:38 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-02-01 23:42:38 +0000 |
| commit | fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3 (patch) | |
| tree | 347f771202054a443f9df23a8f65f91d49a52209 /actionpack/lib/action_view/render/partials.rb | |
| parent | 27fa38cc3e162b2f8c4bb2d50130fbc17bad6039 (diff) | |
| parent | 16c0d1d3b6089bb4b0b0baf7c3eeb5949f31f02b (diff) | |
| download | rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.gz rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.tar.bz2 rails-fdcf4d6c5191b25ee3b6c357dafaf17156eb09d3.zip | |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionpack/lib/action_view/render/partials.rb')
| -rw-r--r-- | actionpack/lib/action_view/render/partials.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/render/partials.rb b/actionpack/lib/action_view/render/partials.rb index 8c936ae09e..8b6dce0c1c 100644 --- a/actionpack/lib/action_view/render/partials.rb +++ b/actionpack/lib/action_view/render/partials.rb @@ -240,7 +240,7 @@ module ActionView end result = @template ? collection_with_template : collection_without_template - result.join(spacer).html_safe! + result.join(spacer).html_safe end def collection_with_template(template = @template) |