From 5d53eefcab751b34bc20ba3467e36d6225997904 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 28 Sep 2017 16:09:27 +0800 Subject: [PATCH] Fix broken test. --- app/controllers/application_controller.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 75b2566f51..7a7f9cf726 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -157,10 +157,16 @@ class ApplicationController < ActionController::Base opts ||= {} show_json_errors = (request.format && request.format.json?) || (request.xhr?) || - ((params[:external_id] || '').ends_with? '.json') || - !(current_user rescue nil) + ((params[:external_id] || '').ends_with? '.json') - if show_json_errors + invalid_user = + begin + current_user + rescue Discourse::InvalidAccess + nil + end + + if show_json_errors || invalid_user # HACK: do not use render_json_error for topics#show if request.params[:controller] == 'topics' && request.params[:action] == 'show' return render status: status_code, layout: false, plain: (status_code == 404 || status_code == 410) ? build_not_found_page(status_code) : I18n.t(type)