app/controllers/caboose/pages_controller.rb in caboose-cms-0.4.65 vs app/controllers/caboose/pages_controller.rb in caboose-cms-0.4.66
- old
+ new
@@ -49,18 +49,17 @@
def asset
uri = uri.to_s.gsub(/^(.*?)\?.*?$/, '\1')
uri.chop! if uri.end_with?('/')
uri[0] = '' if uri.starts_with?('/')
- page = Page.page_with_uri(request.host_with_port, File.dirname(uri), false)
- if (page.nil? || !page)
+ page = Page.page_with_uri(request.host_with_port, File.dirname(uri), false)
+ if page.nil? || !page
# Check for a 301 redirect
site_id = Site.id_for_domain(request.host_with_port)
- new_url = PermanentRedirect.match(site_id, request.fullpath)
- if new_url
- Caboose.log("Found a redirect: #{new_url}")
- redirect_to new_url
+ new_url = PermanentRedirect.match(site_id, request.fullpath)
+ if new_url
+ redirect_to new_url, :status => 301
return
end
respond_to do |format|
format.all { render :file => "caboose/extras/error404", :layout => "caboose/error404", :formats => [:html] }