diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-24 16:49:21 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-24 16:49:21 +0100 |
| commit | 0860cd563f6fa904b80c2ec01e42e4a0d891ba33 (patch) | |
| tree | b86edea079d90e13383d5f5626039a72c8bc0772 /app/models | |
| parent | 7cb0812d212475c53b0175f832bb7ffe33de1749 (diff) | |
| parent | 5ad0dcc660b1fdb8e8625b41950547aa7f6c5c49 (diff) | |
Merge branch 'feature/ruby-19-compat-immediate' into develop
Conflicts:
Gemfile.lock
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/incoming_message.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 367909f57..48fbfe73a 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -347,12 +347,10 @@ class IncomingMessage < ActiveRecord::Base text.gsub!(/^\s?#{name}[^\n]+\n([^\n]+\n)?\s?Sent by:[^\n]+\n.*/ims, "\n\n" + replacement) # Some other sort of forwarding quoting - # http://www.whatdotheyknow.com/request/224/response/326 - text.gsub!(/^#{name}[^\n]+\n[0-9\/:\s]+\s+To\s+FOI requests at.*/ims, "\n\n" + replacement) + text.gsub!(/^\s?#{name}\s+To\s+FOI requests at.*/ims, "\n\n" + replacement) - # http://www.whatdotheyknow.com/request/how_do_the_pct_deal_with_retirin_33#incoming-930 # http://www.whatdotheyknow.com/request/229/response/809 - text.gsub!(/^From: [^\n]+\nSent: [^\n]+\nTo:\s+['"?]#{name}['"]?\nSubject:.*/ims, "\n\n" + replacement) + text.gsub!(/^\s?From: [^\n]+\n\s?Sent: [^\n]+\n\s?To:\s+['"]?#{name}['"]?\n\s?Subject:.*/ims, "\n\n" + replacement) return text |