Fix double-escaping on Search Page

Reported by Andrew Stacey
This commit is contained in:
Jacques Distler 2011-08-22 11:00:03 -05:00
parent 6f18c90a50
commit e387d095ec

View file

@ -24,7 +24,7 @@
<%- end -%> <%- end -%>
<%- if (@results + @title_results).empty? -%> <%- if (@results + @title_results).empty? -%>
<h2>No pages contain "<%= h @query %>" </h2> <h2>No pages contain "<%= h(@query).html_safe %>" </h2>
<p> <p>
Perhaps you should try expanding your query. Remember that Instiki searches for entire Perhaps you should try expanding your query. Remember that Instiki searches for entire
phrases, so if you search for "all that jazz" it will not match pages that contain these phrases, so if you search for "all that jazz" it will not match pages that contain these
@ -36,6 +36,6 @@
"[a-z]*Leet?RegExpSkill(s|z)" "[a-z]*Leet?RegExpSkill(s|z)"
</p> </p>
<p> <p>
<b>Create a new page, named:</b> "<span class='newWikiWord'><%= link_to h(@query), :web => @web.address, :action => 'new', :id => @query %></span>" <b>Create a new page, named:</b> "<span class='newWikiWord'><%= link_to h(@query).html_safe, :web => @web.address, :action => 'new', :id => @query %></span>"
</p> </p>
<%- end -%> <%- end -%>