get rid of nonsense 404.html

correct 404 handling for invalid pages
This commit is contained in:
Sam
2013-05-20 10:29:49 +10:00
parent 18b00d01d0
commit 80fb20816c
7 changed files with 20 additions and 59 deletions

View File

@ -65,14 +65,13 @@ class ApplicationController < ActionController::Base
end
rescue_from Discourse::NotFound do
if !request.format || request.format.html?
# for now do a simple remap, we may look at cleaner ways of doing the render
#
# Sam: I am confused about this, we need a comment that explains why this is conditional
raise ActiveRecord::RecordNotFound
else
render file: 'public/404', formats: [:html], layout: false, status: 404
end
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'
end
rescue_from Discourse::InvalidAccess do