aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/outgoing_message.rb16
1 files changed, 2 insertions, 14 deletions
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index 3e441eacb..a4cb510bb 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -21,7 +21,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: outgoing_message.rb,v 1.61 2008-08-31 12:46:52 francis Exp $
+# $Id: outgoing_message.rb,v 1.62 2008-08-31 15:10:16 francis Exp $
class OutgoingMessage < ActiveRecord::Base
belongs_to :info_request
@@ -156,25 +156,13 @@ class OutgoingMessage < ActiveRecord::Base
# Return body for display as HTML
def get_body_for_html_display
text = self.body.strip
+ text = MySociety::Format.wrap_email_body(text) # reparagraph and wrap it so is good preview of emails
text = CGI.escapeHTML(text)
text = MySociety::Format.make_clickable(text, :contract => 1)
text = text.gsub(/\n/, '<br>')
return text
end
- # Return body for display as HTML
- # XXX this is repeating code in a combination of
- # views/layouts/request_mailer.rhtml and views/request_mailer/initial_request.rhtml
- def get_body_for_html_preview
- text = self.body.strip
- text = MySociety::Format.wrap_email_body(self.body.strip)
- text = CGI.escapeHTML(text)
- text = MySociety::Format.make_clickable(text, :contract => 1)
- text = text.gsub(/\n/, '<br>')
-
- return text
- end
-
end