From c99da154452d97e9ffed933e9645db60f66cdf52 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang <jp_lang@yahoo.fr> Date: Sat, 26 May 2007 16:57:25 +0000 Subject: [PATCH] Show a 404 error page if attachment can not be read. git-svn-id: http://redmine.rubyforge.org/svn/trunk@544 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/attachments_controller.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 3528e7220..e0a02d8e8 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -16,17 +16,22 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class AttachmentsController < ApplicationController + layout 'base' before_filter :find_project, :check_project_privacy # sends an attachment def download send_file @attachment.diskfile, :filename => @attachment.filename + rescue + render_404 end # sends an image to be displayed inline def show render(:nothing => true, :status => 404) and return unless @attachment.diskfile =~ /\.(jpeg|jpg|gif|png)$/i send_file @attachment.diskfile, :type => "image/#{$1}", :disposition => 'inline' + rescue + render_404 end private