From 86819f08c3294313b9b414f3c38644e4a60284c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 11 Feb 2016 18:48:09 +0100 Subject: [PATCH] FIX: use RFC-compliant previous replies separator --- app/mailers/user_notifications.rb | 2 +- lib/email/receiver.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 9029341d900..6f2345137bc 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -275,7 +275,7 @@ class UserNotifications < ActionMailer::Base context_posts = context_posts.to_a if context_posts.present? - context << "---\n*#{I18n.t('user_notifications.previous_discussion')}*\n" + context << "-- \n*#{I18n.t('user_notifications.previous_discussion')}*\n" context_posts.each do |cp| context << email_post_markdown(cp) end diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index fdaaddea354..cb45b7d8ba9 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -143,7 +143,7 @@ module Email end def previous_replies_regex - @previous_replies_regex ||= /^---\n\*#{I18n.t("user_notifications.previous_discussion")}\*\n/im + @previous_replies_regex ||= /^--[- ]\n\*#{I18n.t("user_notifications.previous_discussion")}\*\n/im end def trim_discourse_markers(reply)