aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/incoming_message.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2012-12-06 10:43:07 +0000
committerLouise Crow <louise.crow@gmail.com>2012-12-06 14:15:58 +0000
commit1d4ef88e60bcecc5c413cf3b6e6cb76f4bb6eaa1 (patch)
tree07ec85e8469f5ed2f1ce6ce3ca241ed0be729f5e /app/models/incoming_message.rb
parent12b9d57ea9bbe69e5e195a90085b66056f4116a4 (diff)
Rename _get_attachment_text_internal_one_file to get_attachment_text_one_file as it is now an externally-accessed method of the mail handler module.
Diffstat (limited to 'app/models/incoming_message.rb')
-rw-r--r--app/models/incoming_message.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index e1702689c..868bec910 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -475,7 +475,7 @@ class IncomingMessage < ActiveRecord::Base
rescue Iconv::IllegalSequence
use_charset = source_charset
end
- text = MailHandler._get_attachment_text_internal_one_file(part.content_type, text, use_charset)
+ text = MailHandler.get_attachment_text_one_file(part.content_type, text, use_charset)
end
end
@@ -510,6 +510,7 @@ class IncomingMessage < ActiveRecord::Base
return text
end
+
# Returns part which contains main body text, or nil if there isn't one
def get_main_body_text_part
leaves = self.foi_attachments
@@ -708,7 +709,7 @@ class IncomingMessage < ActiveRecord::Base
text = ''
attachments = self.get_attachments_for_display
for attachment in attachments
- text += MailHandler._get_attachment_text_internal_one_file(attachment.content_type, attachment.body, attachment.charset)
+ text += MailHandler.get_attachment_text_one_file(attachment.content_type, attachment.body, attachment.charset)
end
# Remove any bad characters
text = Iconv.conv('utf-8//IGNORE', 'utf-8', text)