diff options
| -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> |