Merge remote-tracking branch 'openaustralia_github/fix-production-diagnostic-messages' into rails-3-develop

1 files changed, 4 insertions, 7 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 88b107861..2ce44011f 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -119,12 +119,9 @@ class ApplicationController < ActionController::Base
     end
 
     def render_exception(exception)
-
-        # In development, or the admin interface, or for a local request, let Rails handle the exception
-        # with its stack trace templates. Local requests in testing are a special case so that we can
-        # test this method - there we use consider_all_requests_local to control behaviour.
-        if Rails.application.config.consider_all_requests_local || local_request? ||
-        (request.local? && !Rails.env.test?)
+        # In development or the admin interface let Rails handle the exception
+        # with its stack trace templates
+        if Rails.application.config.consider_all_requests_local || show_rails_exceptions?
             raise exception
         end
 
@@ -150,7 +147,7 @@ class ApplicationController < ActionController::Base
         end
     end
 
-    def local_request?
+    def show_rails_exceptions?
         false
     end