Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

2010-07-21 09:42:26 -05:00 · 2010-07-21 09:42:26 -05:00 · 3bfc30231a
parent 63e4c43a54 267f4a51fc
commit 3bfc30231a
1 changed files with 1 additions and 1 deletions
--- 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 -%>