diff options
| -rw-r--r-- | app/models/incoming_message.rb | 6 | ||||
| -rw-r--r-- | app/views/request/_bubble.rhtml | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 4bdb7323b..4f66bcc25 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -20,7 +20,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: incoming_message.rb,v 1.28 2008-01-18 03:30:21 francis Exp $ +# $Id: incoming_message.rb,v 1.29 2008-01-18 03:54:04 francis Exp $ module TMail class Mail @@ -47,7 +47,7 @@ class IncomingMessage < ActiveRecord::Base # Number the attachments in depth first tree order, for use in URLs. def after_initialize - if !@mail.nil? + if !self.mail.nil? @count_parts_count = 0 count_parts_recursive(self.mail) end @@ -76,7 +76,7 @@ class IncomingMessage < ActiveRecord::Base # Return the structured TMail::Mail object # Documentation at http://i.loveruby.net/en/projects/tmail/doc/ def mail - if @mail.nil? + if @mail.nil? && !self.raw_data.nil? @mail = TMail::Mail.parse(self.raw_data) @mail.base64_decode end diff --git a/app/views/request/_bubble.rhtml b/app/views/request/_bubble.rhtml index be5251e50..387ff7657 100644 --- a/app/views/request/_bubble.rhtml +++ b/app/views/request/_bubble.rhtml @@ -6,8 +6,8 @@ <% attachments.each do |a| %> Attachment: <%= link_to (TMail::Mail.get_part_file_name(a) || "download.bin"), get_attachment_url(:id => incoming_message.info_request_id, - :incoming_message_id => incoming_message.id, :part => a.url_part_number, - :file_name => (TMail::Mail.get_part_file_name(a) || "download.bin")) %> + :incoming_message_id => incoming_message.id, :part => a.url_part_number, :file_name => + (TMail::Mail.get_part_file_name(a) || "download.bin")) %> (<%= a.content_type %>) <br> <% end %> |