aboutsummaryrefslogtreecommitdiffstats
path: root/app/models/info_request.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-06-10 13:48:52 -0700
committerLouise Crow <louise.crow@gmail.com>2013-06-10 13:48:52 -0700
commit5046af9b722b7b9b822fa9437714b957b0e7da3f (patch)
treeea1c9a723c9be0a5dc3b9befa20abd05a34eee60 /app/models/info_request.rb
parent5f2d2cc229f4d80495a8335c5fa72e6589af230f (diff)
parentad2845ecd00840b21092fda676aabb15f6ea51ae (diff)
Merge branch 'hotfix/0.11.0.7' into rails-3-develop
Conflicts: spec/models/info_request_spec.rb
Diffstat (limited to 'app/models/info_request.rb')
-rw-r--r--app/models/info_request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index a7d482930..46c247fa9 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -278,7 +278,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)