diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-03 18:20:31 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-03 18:20:31 +0100 |
| commit | a91722f2653be237dc58121a6b895de18081dfdc (patch) | |
| tree | 6e01520e44fa9cdd83c98214c3fe8a8c1e5abc1f /app/controllers/application_controller.rb | |
| parent | 050b25bd70909913b7e42d53cb69c31b1396cc46 (diff) | |
| parent | 9a4b220be62dcaceee45c70316c1a58a92abcfc5 (diff) | |
Merge branch 'hotfix/0.11.0.1' into wdtk
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2615b61f2..d1d702616 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -142,7 +142,10 @@ class ApplicationController < ActionController::Base ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver @status = 500 end - render :template => "general/exception_caught", :status => @status + respond_to do |format| + format.html{ render :template => "general/exception_caught", :status => @status } + format.any{ render :nothing => true, :status => @status } + end end def local_request? |