diff options
| author | Santiago Pastorino and José Ignacio Costa <santiago+jose@wyeworks.com> | 2010-02-04 21:14:46 -0200 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-02-05 13:28:43 -0800 |
| commit | e115eb097e3e5704b9861b6f2b92cc25d23de07c (patch) | |
| tree | 7dc98fe10f7ac49052b15abc2c1caf74e39cfd09 /actionpack/lib/action_view/render/rendering.rb | |
| parent | c65f4b1ffb3862909df7c883f3486e08425bdc6a (diff) | |
| download | rails-e115eb097e3e5704b9861b6f2b92cc25d23de07c.tar.gz rails-e115eb097e3e5704b9861b6f2b92cc25d23de07c.tar.bz2 rails-e115eb097e3e5704b9861b6f2b92cc25d23de07c.zip | |
More html_safe strings now use the safe_concat method
[#3856 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
Diffstat (limited to 'actionpack/lib/action_view/render/rendering.rb')
| -rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index 7c33f1334a..abc7c09991 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -19,7 +19,7 @@ module ActionView options[:locals] ||= {} if block_given? - return concat(_render_partial(options.merge(:partial => layout), &block)) + return safe_concat(_render_partial(options.merge(:partial => layout), &block)) elsif options.key?(:partial) return _render_partial(options) end |