From 267f4a51fc8734ffd0ba0c30ce73a855f9140519 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Wed, 21 Jul 2010 09:39:18 -0500
Subject: [PATCH] Don't escape web.additional_style

Reported by Andrew Stacey
---
 app/views/layouts/default.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index 79dba5dc..42e0ff95 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -30,7 +30,7 @@
   </style>
   <%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
   <style type="text/css"><!--/*--><![CDATA[/*><!--*/    
-    <%= @web ? @web.additional_style : '' %>
+    <%= @web ? @web.additional_style.html_safe : '' %>
   /*]]>*/--></style>
   <%= javascript_include_tag :defaults %>
   <%- if @web -%>