diff options
| author | Henare Degan <henare.degan@gmail.com> | 2012-12-09 18:21:05 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2012-12-11 11:09:33 +1100 |
| commit | 4b007cbcc938bd88230ac81e8b377d181d7d9c20 (patch) | |
| tree | 1fdc35af1881c8fd3d745f1678053a5ebc4cbfa8 /app/controllers/application_controller.rb | |
| parent | 2d5c2b34222c3162348bce664d28360845abe20e (diff) | |
Disable rescue customisations until we can move it to rack
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 79fde5a7f..51e37d8f0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -151,19 +151,20 @@ class ApplicationController < ActionController::Base render :template => "general/exception_caught.rhtml", :status => @status end - # For development sites. - alias original_rescue_action_locally rescue_action_locally - def rescue_action_locally(exception) - # Make sure expiry time for session is set (before_filters are - # otherwise missed by this override) - session_remember_me - - # Make sure the locale is set correctly too - set_gettext_locale - - # Display default, detailed error for developers - original_rescue_action_locally(exception) - end + # FIXME: This was disabled during the Rails 3 upgrade as this is now handled by Rack + # # For development sites. + # alias original_rescue_action_locally rescue_action_locally + # def rescue_action_locally(exception) + # # Make sure expiry time for session is set (before_filters are + # # otherwise missed by this override) + # session_remember_me + + # # Make sure the locale is set correctly too + # set_gettext_locale + + # # Display default, detailed error for developers + # original_rescue_action_locally(exception) + # end def local_request? false |