diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-26 22:33:06 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-09-26 22:33:06 +0000 |
| commit | 22bcce63aad6fc2b9e6cb8d6e94fcc653a0080a7 (patch) | |
| tree | d8227c757550d752135dc55566822f49662c44d7 | |
| parent | ef90132cf3635544ff33a3f13d294b6a7f071918 (diff) | |
| download | redmine-22bcce63aad6fc2b9e6cb8d6e94fcc653a0080a7.tar.gz redmine-22bcce63aad6fc2b9e6cb8d6e94fcc653a0080a7.zip | |
Merged r4177 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4198 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/files_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |