diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-10 13:10:41 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-10 13:10:41 -0700 |
| commit | bb7e81a56d499fa200216071c98b60deb056bf12 (patch) | |
| tree | 36c1b2f16485b21dbc76ad12ed797d766d05c679 /app/models/info_request.rb | |
| parent | 2f4c5ea991976ad9443431609f0274ea128353bb (diff) | |
| parent | c8a3fc5cd2c5e24613819747c1ac3e1f65469fbd (diff) | |
Merge branch 'hotfix/0.11.0.7' into wdtk
Conflicts:
lib/tasks/temp.rake
spec/models/info_request_spec.rb
Diffstat (limited to 'app/models/info_request.rb')
| -rw-r--r-- | app/models/info_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |