diff options
| -rw-r--r-- | app/controllers/application.rb | 4 | ||||
| -rw-r--r-- | app/models/info_request.rb | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/controllers/application.rb b/app/controllers/application.rb index d51f6cf1d..0f151874a 100644 --- a/app/controllers/application.rb +++ b/app/controllers/application.rb @@ -6,7 +6,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: application.rb,v 1.42 2008-04-30 00:46:00 francis Exp $ +# $Id: application.rb,v 1.43 2008-04-30 01:42:39 francis Exp $ class ApplicationController < ActionController::Base @@ -141,7 +141,7 @@ class ApplicationController < ActionController::Base end # Function for search - def perform_search(query, sortby, collapse, per_page = 25, this_page = nil, html_highlight = true) + def perform_search(query, sortby, collapse, per_page = 25, this_page = nil) @query = query @sortby = sortby diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 2e614e4bd..eec8091e3 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -21,7 +21,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.101 2008-04-30 01:19:53 francis Exp $ +# $Id: info_request.rb,v 1.102 2008-04-30 01:42:39 francis Exp $ require 'digest/sha1' require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian') @@ -68,8 +68,6 @@ class InfoRequest < ActiveRecord::Base # (Not really the right place to put it, but everything can get it here, and it # does *mainly* find info requests, via their events, so hey) def InfoRequest.full_search(query, order, ascending, collapse, per_page, page) - # XXX handle order better - # XXX html_highlight offset = (page - 1) * per_page return ::ActsAsXapian::Search.new( [InfoRequestEvent, PublicBody, User], query, |