github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 23:07:28 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

HACK: Keep old behavior for topics#show

Browse Source
This commit is contained in:
riking
2015-02-08 13:35:09 -08:00
parent 8cf21f2363
commit a16aa9fde8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/application_controller.rb
View File

@ -99,7 +99,7 @@ class ApplicationController < ActionController::Base
rescue_from Discourse::NotLoggedIn do |e| rescue_from Discourse::NotLoggedIn do |e|
raise e if Rails.env.test? raise e if Rails.env.test?
if (request.format && request.format.json?) || (request.xhr?) if (request.format && request.format.json?) || request.xhr? || !request.get?
rescue_discourse_actions('not_logged_in', 403, true) rescue_discourse_actions('not_logged_in', 403, true)
else else
redirect_to "/" redirect_to "/"
@ -120,7 +120,13 @@ class ApplicationController < ActionController::Base
end end
def rescue_discourse_actions(type, status_code, include_ember=false) def rescue_discourse_actions(type, status_code, include_ember=false)
if (request.format && request.format.json?) || (request.xhr?) if (request.format && request.format.json?) || (request.xhr?)
# 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, text: (status_code == 404) ? build_not_found_page(status_code) : I18n.t(type)
end
render_json_error I18n.t(type), type, status_code render_json_error I18n.t(type), type, status_code
else else
render text: build_not_found_page(status_code, include_ember ? 'application' : 'no_ember') render text: build_not_found_page(status_code, include_ember ? 'application' : 'no_ember')