diff options
author | Matthew Landauer <matthew@openaustralia.org> | 2013-02-25 12:29:11 +1100 |
---|---|---|
committer | Matthew Landauer <matthew@openaustralia.org> | 2013-02-25 12:32:56 +1100 |
commit | 876ffb119ef52ffa32b8cfc0021510edbd332ede (patch) | |
tree | ff9502fdb998a7043787ff9a2ce709f33727349f | |
parent | 2a193d3bc74b812bd9ddee9d7520ca1e98007511 (diff) |
Don't quote plain text message for text email. Fixes #828
This is fixed for emails to the admin via the contact form, emails
between users and emails from the admins to a user
-rw-r--r-- | app/views/contact_mailer/from_admin_message.rhtml | 2 | ||||
-rw-r--r-- | app/views/contact_mailer/to_admin_message.rhtml | 2 | ||||
-rw-r--r-- | app/views/contact_mailer/user_message.rhtml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/contact_mailer/from_admin_message.rhtml b/app/views/contact_mailer/from_admin_message.rhtml index 43938e0dd..4169d8d3a 100644 --- a/app/views/contact_mailer/from_admin_message.rhtml +++ b/app/views/contact_mailer/from_admin_message.rhtml @@ -1,2 +1,2 @@ -<%= @message %> +<%= raw @message %> diff --git a/app/views/contact_mailer/to_admin_message.rhtml b/app/views/contact_mailer/to_admin_message.rhtml index 9c0a74c02..8c56779fd 100644 --- a/app/views/contact_mailer/to_admin_message.rhtml +++ b/app/views/contact_mailer/to_admin_message.rhtml @@ -1,4 +1,4 @@ -<%= @message.strip %> +<%= raw @message.strip %> --------------------------------------------------------------------- <%= _('Message sent using {{site_name}} contact form, ', :site_name=>site_name)%> diff --git a/app/views/contact_mailer/user_message.rhtml b/app/views/contact_mailer/user_message.rhtml index b1d6e81ae..afa1494db 100644 --- a/app/views/contact_mailer/user_message.rhtml +++ b/app/views/contact_mailer/user_message.rhtml @@ -5,7 +5,7 @@ learn your email address. Only reply if that is okay.', :user_name => @from_user.name) %> --------------------------------------------------------------------- -<%= @message.strip %> +<%= raw @message.strip %> --------------------------------------------------------------------- <%= _('View Freedom of Information requests made by {{user_name}}:', :user_name=>@from_user.name)%> |