diff options
| author | Francis Irving <francis@mysociety.org> | 2009-11-28 00:35:31 +0000 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2009-11-28 00:35:31 +0000 |
| commit | 7de945967825231ef9bd04faaba8bec86ae26828 (patch) | |
| tree | 4d9065db671646f9dd2710a5b7ff73f59dae4db8 | |
| parent | a6a8c74b9e5c2f108c6aefc97c66aecb67d95e9b (diff) | |
Whoops broke all searches - fix so default is right.
| -rw-r--r-- | app/controllers/general_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index bb56a9f49..5c4103616 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -120,7 +120,10 @@ class GeneralController < ApplicationController # Query each type separately for separate display (XXX we are calling # perform_search multiple times and it clobbers per_page for each one, # so set as separate var) - requests_per_page = params[:requests_per_page].to_i || 25; + requests_per_page = 25 + if params[:requests_per_page] + requests_per_page = params[:requests_per_page].to_i + end @xapian_requests = perform_search([InfoRequestEvent], @query, @sortby, 'request_collapse', requests_per_page) @requests_per_page = @per_page @xapian_bodies = perform_search([PublicBody], @query, @sortby, nil, 5) |