From e387d095ec688931784e82c6235533ba0a93cb10 Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Mon, 22 Aug 2011 11:00:03 -0500
Subject: [PATCH] Fix double-escaping on Search Page Reported by Andrew Stacey

---
 app/views/wiki/search.rhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/wiki/search.rhtml b/app/views/wiki/search.rhtml
index 59d412ea..f145bbb0 100644
--- a/app/views/wiki/search.rhtml
+++ b/app/views/wiki/search.rhtml
@@ -24,7 +24,7 @@
 <%- end -%>
 
 <%- if (@results + @title_results).empty? -%>
-  <h2>No pages contain "<%= h @query %>" </h2>
+  <h2>No pages contain "<%= h(@query).html_safe %>" </h2>
   <p>
     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 
@@ -36,6 +36,6 @@
     "[a-z]*Leet?RegExpSkill(s|z)"
   </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>
 <%- end -%>