diff options
| author | francis <francis> | 2008-02-16 02:36:16 +0000 |
|---|---|---|
| committer | francis <francis> | 2008-02-16 02:36:16 +0000 |
| commit | bfe805c1fe29797a2a73cf6149d19ead878b9b9f (patch) | |
| tree | 160f0bd5ccef50ee2c3ebcd8da66268d34dc80e1 /app/models | |
| parent | 3cd16cbee8c43b30b97813356cf600824c3cd38a (diff) | |
Display less confusing text than ..@.. for masked emails.
Preprocess the funny double angle bracket quoted URLs.
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/incoming_message.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index dfc7c1a54..b4af65d77 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -18,7 +18,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: incoming_message.rb,v 1.40 2008-02-14 15:31:22 francis Exp $ +# $Id: incoming_message.rb,v 1.41 2008-02-16 02:36:17 francis Exp $ # TODO @@ -121,7 +121,7 @@ class IncomingMessage < ActiveRecord::Base # either the requestor's email address or the request's response email # address out onto the internet rx = Regexp.new(MySociety::Validate.email_match_regexp) - text.gsub!(rx, "...@...") + text.gsub!(rx, "[email address]") return text end @@ -244,6 +244,7 @@ class IncomingMessage < ActiveRecord::Base if collapse_quoted_sections text = folded_quoted_text end + text = MySociety::Format.simplify_angle_bracketed_urls(text) text = CGI.escapeHTML(text) text = MySociety::Format.make_clickable(text, :contract => 1) if collapse_quoted_sections |