aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-11-04 15:16:01 +0000
committerGareth Rees <gareth@mysociety.org>2014-11-04 15:16:01 +0000
commit401f44b19bbe9defca7623fdf5436b94d06def83 (patch)
treee6f6294dd18596b8d5733da43cb9977a02f685a1 /app/models
parent01be1a10f03f060f6e9d30a19ef40c723117d6cb (diff)
Add fix for Apple Mail with attachments
Diffstat (limited to 'app/models')
-rw-r--r--app/models/incoming_message.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 135a6bdaf..db6722976 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -693,8 +693,10 @@ class IncomingMessage < ActiveRecord::Base
self.reload
# get the main body part from the set of attachments we just created,
- # not from the self.foi_attachments association - some of the total set of
- # self.foi_attachments may now be obsolete
+ # not from the self.foi_attachments association - some of the total set
+ # of self.foi_attachments may now be obsolete. Sometimes (e.g. when
+ # parsing mail from Apple Mail) we can end up with less attachments
+ # because the hexdigest of an attachment is identical.
main_part = get_main_body_text_part(attachments)
# we don't use get_main_body_text_internal, as we want to avoid charset
# conversions, since /usr/bin/uudecode needs to deal with those.