diff options
| author | Gareth Rees <gareth@mysociety.org> | 2014-04-14 12:14:28 +0100 |
|---|---|---|
| committer | Gareth Rees <gareth@mysociety.org> | 2014-04-14 12:14:28 +0100 |
| commit | eeddc8f46a9583782ee8185de395499d99a5d12a (patch) | |
| tree | c2a694bd2137cbb7ceb019864014b7aff0b7ea7b /app/controllers/application_controller.rb | |
| parent | d1f2d56834688c5b449ac8c50b67dff0672ca074 (diff) | |
| parent | b0fbe646f386b866791fbb321d6fa183bb4a6517 (diff) | |
Merge branch 'issues/1346-pagination-params-error' into rails-3-develop
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 410778d9a..ba086cfa3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -129,7 +129,7 @@ class ApplicationController < ActionController::Base @exception_class = exception.class.to_s @exception_message = exception.message case exception - when ActiveRecord::RecordNotFound, RouteNotFound + when ActiveRecord::RecordNotFound, RouteNotFound, WillPaginate::InvalidPage @status = 404 sanitize_path(params) when PermissionDenied |