diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-11-10 14:50:49 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-11-10 14:50:49 +0000 |
| commit | e7c060068edcd2b47cd9b2306364ad2ff12ab0f9 (patch) | |
| tree | 3ace8af06787732a88ce30a4b179f73b3d236d01 /app/models/incoming_message.rb | |
| parent | ce28b7b52bb931f94a977a55c0fd184dc220e1f5 (diff) | |
| parent | 30124584b611eaa5747fb8032ce14393c3515a24 (diff) | |
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
Diffstat (limited to 'app/models/incoming_message.rb')
| -rw-r--r-- | app/models/incoming_message.rb | 6 |
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. |