Merged r6324 and r6325 from trunk (#8651).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@7766 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-11-11 11:35:03 +00:00
parent c605477da5
commit 03b2162e6c
3 changed files with 251 additions and 1 deletions
@@ -198,7 +198,7 @@ class MailHandler < ActionMailer::Base
  end

  def add_attachments(obj)
-    if email.has_attachments?
+    if email.attachments && email.attachments.any?
      email.attachments.each do |attachment|
        Attachment.create(:container => obj,
                          :file => attachment,