Merging changes from trunk into stable branch

[feedcatcher.git] / app / views / layouts / application.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb

index 1599adb0cc371ff7dd1d8f0205811fa415c56999..1f8b1b48cb010e57d785ccbf15998ff690a80671 100644 (file)
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -5,7 +5,7 @@
    </head>
    <body>
      <% if flash[:notice] -%>
-      <div id="notice"><%= flash[:notice] %></div>
+      <div id="notice"><%= h flash[:notice] %></div>
      <% end -%>
      <%= yield :layout %>
    </body>