aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-04-09 09:14:02 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-04-09 09:14:02 -0700
commit19e6006636ecc071cc3b4ec3d339029626c06e72 (patch)
treea0561ed1a1ee3398d9eb0e2a7599766a58c67b3f /actionpack/lib
parent157216b7b7dfc6fc61b03c75dcc372bbdf3e8b22 (diff)
downloadrails-19e6006636ecc071cc3b4ec3d339029626c06e72.tar.gz
rails-19e6006636ecc071cc3b4ec3d339029626c06e72.tar.bz2
rails-19e6006636ecc071cc3b4ec3d339029626c06e72.zip
Layout contents are html-safe
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/render/layouts.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
index 7311730a19..31b09d9f0a 100644
--- a/actionpack/lib/action_view/render/layouts.rb
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -48,7 +48,7 @@ module ActionView
#
def _layout_for(name = nil, &block) #:nodoc:
if !block || name
- @_content_for[name || :layout]
+ @_content_for[name || :layout].html_safe
else
capture(&block)
end