From b52a66c2079a3d14ede1562bd686e7421f624954 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Thu, 10 Nov 2011 16:03:54 -0600
Subject: [PATCH] Don't escape style_additions

Credit to Andrew Stacey
---
 app/views/layouts/default.rhtml | 2 +-
 app/views/wiki/source.html.erb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index c05e0292..2280bcbf 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -28,7 +28,7 @@
     <%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %>
     <%= Rails.root.join('public', 'stylesheets', 'syntax.css').read if @inline_style %>
   </style>
-  <%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
+  <%= "<style type='text/css'>#{@style_additions}</style>".html_safe if @style_additions %>
   <style type="text/css"><!--/*--><![CDATA[/*><!--*/    
     <%= @web && @web.additional_style ? @web.additional_style.html_safe : '' %>
   /*]]>*/--></style>
diff --git a/app/views/wiki/source.html.erb b/app/views/wiki/source.html.erb
index bb2efaf8..0536ab1e 100644
--- a/app/views/wiki/source.html.erb
+++ b/app/views/wiki/source.html.erb
@@ -19,7 +19,7 @@
     <%= Rails.root.join('public', 'stylesheets', 'instiki.css').read if @inline_style %>
   </style>
   <%= stylesheet_link_tag 'instiki', :media => 'all'  unless @inline_style %>
-  <%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
+  <%= "<style type='text/css'>#{@style_additions}</style>".html_safe if @style_additions %>
   <style type="text/css"><!--/*--><![CDATA[/*><!--*/    
     <%= @web ? @web.additional_style : '' %>
   /*]]>*/--></style>