From 14a9d8383631e68e0349bef3aa3be623de7e0688 Mon Sep 17 00:00:00 2001 From: Mark Longair Date: Thu, 6 Jun 2013 11:18:55 +0100 Subject: Cope with replying to a message with a missing or empty Subject Conflicts: spec/models/info_request_spec.rb --- app/models/info_request.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/models/info_request.rb') diff --git a/app/models/info_request.rb b/app/models/info_request.rb index cf1af0e87..c549d6f5d 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -294,7 +294,7 @@ public end end def email_subject_followup(incoming_message = nil) - if incoming_message.nil? || !incoming_message.valid_to_reply_to? + if incoming_message.nil? || !incoming_message.valid_to_reply_to? || !incoming_message.subject 'Re: ' + self.email_subject_request else if incoming_message.subject.match(/^Re:/i) -- cgit v1.2.3