diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-09 09:14:02 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-04-09 09:14:02 -0700 |
| commit | 19e6006636ecc071cc3b4ec3d339029626c06e72 (patch) | |
| tree | a0561ed1a1ee3398d9eb0e2a7599766a58c67b3f | |
| parent | 157216b7b7dfc6fc61b03c75dcc372bbdf3e8b22 (diff) | |
| download | rails-19e6006636ecc071cc3b4ec3d339029626c06e72.tar.gz rails-19e6006636ecc071cc3b4ec3d339029626c06e72.tar.bz2 rails-19e6006636ecc071cc3b4ec3d339029626c06e72.zip | |
Layout contents are html-safe
| -rw-r--r-- | actionpack/lib/action_view/render/layouts.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb index c812d45a57..705865ce19 100644 --- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb +++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb @@ -7,7 +7,7 @@ </head> <body> -<%=raw yield %> +<%= yield %> </body> </html> |