deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Web Style Tweaks are CDATA

Browse source 
Make sure they're properly escaped.
This commit is contained in:
Jacques Distler 2008-02-29 02:40:22 -06:00
parent 9b7b6fb805
commit ad620f63d3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/edit_web.rhtml
View file

@ -69,7 +69,7 @@
tags.</em> tags.</em>
<br/> <br/>
<textarea id="additionalStyle" class="disableAutoComplete" cols="50" rows="20" <textarea id="additionalStyle" class="disableAutoComplete" cols="50" rows="20"
style="display:none" name="additional_style"><%= @web.additional_style %> style="display:none" name="additional_style"><%= h(@web.additional_style) %>
</textarea> </textarea>
</div> </div>

4
app/views/layouts/default.rhtml
View file

@ -26,10 +26,10 @@
<%= stylesheet_link_tag 'instiki' unless @inline_style %> <%= stylesheet_link_tag 'instiki' unless @inline_style %>
<style type="text/css"> <style type="text/css"><!--/*--><![CDATA[/*><!--*/
<%= @style_additions %> <%= @style_additions %>
<%= @web ? @web.additional_style : '' %> <%= @web ? @web.additional_style : '' %>
</style> /*]]>*/--></style>
<%= javascript_include_tag :defaults %> <%= javascript_include_tag :defaults %>
<% if @web %> <% if @web %>
<%= auto_discovery_link_tag(:atom, :controller => 'wiki', :web => @web.address, :action => 'atom_with_headlines') %> <%= auto_discovery_link_tag(:atom, :controller => 'wiki', :web => @web.address, :action => 'atom_with_headlines') %>