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

2011-08-27 16:34:33 -05:00 · 2011-08-27 16:34:33 -05:00 · b1d1f74b7d
parent c5a2e325c0 a088201062
commit b1d1f74b7d
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@ -211,7 +211,7 @@ EOL


  def search
-    @query = params['query'].purify
+    @query = params['query'] ? params['query'].purify : ''
    @title_results = @web.select { |page| page.name =~ /#{@query}/i }.sort
    @results = @web.select { |page| page.content =~ /#{@query}/i }.sort
    all_pages_found = (@results + @title_results).uniq