diff options
author | francis <francis> | 2007-12-31 04:07:48 +0000 |
---|---|---|
committer | francis <francis> | 2007-12-31 04:07:48 +0000 |
commit | 3dd92c91935eaf7d33a58142e0eb7c8a3eb420e3 (patch) | |
tree | e195458cc1c2f455c44eac5c81b393f2d3fe1e11 | |
parent | 0abcd8e0aeecb6627e1f178d3df24137cf028eba (diff) |
Strip blank parts from between quoted sections when folded.
-rw-r--r-- | app/models/incoming_message.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index ebdf0161c..aedba8e04 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -19,7 +19,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.19 2007-12-31 04:03:47 francis Exp $ +# $Id: incoming_message.rb,v 1.20 2007-12-31 04:07:48 francis Exp $ class IncomingMessage < ActiveRecord::Base belongs_to :info_request @@ -141,7 +141,7 @@ class IncomingMessage < ActiveRecord::Base text = CGI.escapeHTML(text) text = MySociety::Format.make_clickable(text, :contract => 1) if collapse_quoted_sections - text = text.gsub(/(BEGIN_QUOTED(.+?)END_QUOTED)+/m, '<a href="?unfold=1">show quoted sections</a>') + text = text.gsub(/(BEGIN_QUOTED(.+?)END_QUOTED\s*)+/m, '<a href="?unfold=1">show quoted sections</a>') else if text.include?('BEGIN_QUOTED') text = text.gsub(/BEGIN_QUOTED(.+?)END_QUOTED/m, '\1') |