From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Sun, 26 Sep 2010 22:33:06 +0000 (+0000)
Subject: Merged r4177 from trunk.
X-Git-Tag: 1.0.2~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=22bcce63aad6fc2b9e6cb8d6e94fcc653a0080a7;p=redmine.git

Merged r4177 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4198 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index fe5eb48c8..7868d0ddf 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -26,7 +26,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 :controller => 'files', :action => 'index', :id => @project