From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 26 Sep 2010 08:07:41 +0000 (+0000)
Subject: Fixed: error on mail notification when adding an invalid file (#6452).
X-Git-Tag: 1.1.0~336
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e9686cbbe57a671468588638ddc3d6a923400694;p=redmine.git

Fixed: error on mail notification when adding an invalid file (#6452).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4177 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 72a4a2411..d7234985e 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -28,7 +28,7 @@ class FilesController < ApplicationController
     attachments = Attachment.attach_files(container, params[:attachments])
     render_attachment_warning_if_needed(container)
 
-    if !attachments.empty? && Setting.notified_events.include?('file_added')
+    if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
       Mailer.deliver_attachments_added(attachments[:files])
     end
     redirect_to project_files_path(@project)