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

app/views/wiki/locked.rhtml

@@ -1,4 +1,4 @@
-<%- @title = "#{@page.plain_name} is locked" -%>
+<%- @title = "#{@page.plain_name} is locked".html_safe -%>
 
 <p>
   <%= link_to_page(h(@page.locked_by.purify)) %>

app/views/wiki/new.rhtml

@@ -1,5 +1,5 @@
 <%- 
-  @title = "Creating #{CGI.escapeHTML(WikiWords.separate(@page_name))}"
+  @title = "Creating #{WikiWords.separate(@page_name).escapeHTML}".html_safe
   @content_width = 720
   @hide_navigation = true
 -%>

app/views/wiki/search.rhtml

@@ -1,4 +1,4 @@
-<%- @title = "Search results for \"#{h @query}\"" -%>
+<%- @title = "Search results for \"#{h @query}\"".html_safe -%>
 
 <%- unless @title_results.empty? -%>
 <h2><%= @title_results.length %> page(s) containing search string in the page name:</h2>