IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-25 10:20:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

For 403 errors, show the same html page as 404

Browse Source
This commit is contained in:
Neil Lalonde 2013-05-30 14:46:02 -04:00
parent 11aad6fe1e
commit 42714b424f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/controllers/application_controller.rb
View File

@ -69,18 +69,17 @@ class ApplicationController < ActionController::Base
if request.format && request.format.json?
render status: 404, layout: false, text: "[error: 'not found']"
else
f = Topic.where(deleted_at: nil, archetype: "regular")
@latest = f.order('views desc').take(10)
@recent = f.order('created_at desc').take(10)
@slug = params[:slug].class == String ? params[:slug] : ''
@slug.gsub!('-',' ')
render status: 404, layout: 'no_js', template: '/exceptions/not_found'
render_not_found_page(404)
end
end
rescue_from Discourse::InvalidAccess do
render file: 'public/403', formats: [:html], layout: false, status: 403
if request.format && request.format.json?
render status: 403, layout: false, text: "[error: 'invalid access']"
else
render_not_found_page(403)
end
end
@ -279,4 +278,13 @@ class ApplicationController < ActionController::Base
raise Discourse::NotLoggedIn.new unless current_user.present?
end
def render_not_found_page(status=404)
f = Topic.where(deleted_at: nil, archetype: "regular")
@latest = f.order('views desc').take(10)
@recent = f.order('created_at desc').take(10)
@slug = params[:slug].class == String ? params[:slug] : ''
@slug.gsub!('-',' ')
render status: status, layout: 'no_js', template: '/exceptions/not_found'
end
end