Mercurial > hg > soundsoftware-site

diff app/controllers/files_controller.rb @ 51:371eac10df0b live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.
author Chris Cannam
date Wed, 24 Nov 2010 12:20:08 +0000
parents 94944d00e43c
children 0c9da2b87ad6 cbce1fd3b1b7
line wrap: on
line diff
--- a/app/controllers/files_controller.rb	Thu Oct 21 11:19:14 2010 +0100
+++ b/app/controllers/files_controller.rb	Wed Nov 24 12:20:08 2010 +0000
@@ -28,7 +28,7 @@
     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)