diff options
| author | francis <francis> | 2009-03-03 22:37:58 +0000 |
|---|---|---|
| committer | francis <francis> | 2009-03-03 22:37:58 +0000 |
| commit | 80bb95a68258c76b8d4c9af66a1105c96e410424 (patch) | |
| tree | 9795cda46d1ac8595ac6302657aaa2ee1559e956 /app/controllers/user_controller.rb | |
| parent | 528f967463cfbb8a9e5c4eff53e1388c92f48e6a (diff) | |
Patch from Tony Bowden to show the user page even if Xapian setup broken.
Diffstat (limited to 'app/controllers/user_controller.rb')
| -rw-r--r-- | app/controllers/user_controller.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index e69b47c29..5196096ef 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: user_controller.rb,v 1.60 2008-09-21 23:53:50 francis Exp $ +# $Id: user_controller.rb,v 1.61 2009-03-03 22:37:58 francis Exp $ class UserController < ApplicationController # Show page about a user @@ -26,8 +26,13 @@ class UserController < ApplicationController # XXX really should just use SQL query here rather than Xapian. Partly # will be more accurate, as will include backpage'd requests which # don't appear in Xapian. - @xapian_requests = perform_search([InfoRequestEvent], 'requested_by:' + @display_user.url_name, 'newest', 'request_collapse') - @xapian_comments = perform_search([InfoRequestEvent], 'commented_by:' + @display_user.url_name, 'newest', nil) + begin + @xapian_requests = perform_search([InfoRequestEvent], 'requested_by:' + @display_user.url_name, 'newest', 'request_collapse') + @xapian_comments = perform_search([InfoRequestEvent], 'commented_by:' + @display_user.url_name, 'newest', nil) + rescue + @xapian_requests = nil + @xapian_comments = nil + end if (@page > 1) @page_desc = " (page " + @page.to_s + ")" else |