diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-19 08:59:46 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-19 08:59:46 -0700 |
| commit | 2e588963bff5baf256cd2cdc0c8f615b12589edb (patch) | |
| tree | 576074927548d3f88efce02803a0f24114d63d62 | |
| parent | 4a4169c606e0e26b905e11e1fc75c45268498112 (diff) | |
Allow the HTML display of the body of an email to handle the case where the body is only quoted text and there is no subject.0.11.0.14hotfix/0.11.0.14
| -rw-r--r-- | app/models/incoming_message.rb | 2 | ||||
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index f959a8799..4910d43f4 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -713,7 +713,7 @@ class IncomingMessage < ActiveRecord::Base text.strip! # if there is nothing but quoted stuff, then show the subject if text == "FOLDED_QUOTED_SECTION" - text = "[Subject only] " + CGI.escapeHTML(self.subject) + text + text = "[Subject only] " + CGI.escapeHTML(self.subject || '') + text end # and display link for quoted stuff text = text.gsub(/FOLDED_QUOTED_SECTION/, "\n\n" + '<span class="unfold_link"><a href="?unfold=1#incoming-'+self.id.to_s+'">'+_("show quoted sections")+'</a></span>' + "\n\n") diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index 03152f5ff..b06991a34 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -115,6 +115,16 @@ describe IncomingMessage, " when dealing with incoming mail" do end + it 'should handle a main body part that is just quoted content in an email that has + no subject' do + i = IncomingMessage.new + i.stub!(:get_main_body_text_unfolded).and_return("some quoting") + i.stub!(:get_main_body_text_folded).and_return("FOLDED_QUOTED_SECTION") + i.stub!(:subject).and_return(nil) + i.get_body_for_html_display + end + + end describe IncomingMessage, " display attachments" do |