From d63b9b2b3c2517b7e81f4fb6cb75494ef3cdab37 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 27 Mar 2018 21:25:42 +0100 Subject: [PATCH] Strip HTML from email notifications. Fixes #2935 --- app/Notifications/Incident/NewIncidentNotification.php | 2 +- .../IncidentUpdate/IncidentUpdatedNotification.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Notifications/Incident/NewIncidentNotification.php b/app/Notifications/Incident/NewIncidentNotification.php index 0d132539..15e4ab53 100644 --- a/app/Notifications/Incident/NewIncidentNotification.php +++ b/app/Notifications/Incident/NewIncidentNotification.php @@ -78,7 +78,7 @@ class NewIncidentNotification extends Notification ->greeting(trans('notifications.incident.new.mail.greeting', ['app_name' => Config::get('setting.app_name')])) ->line($content) ->action(trans('notifications.incident.new.mail.action'), cachet_route('incident', [$this->incident])) - ->line($this->incident->message) + ->line($this->incident->raw_message) ->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)])) ->line(trans('cachet.subscriber.manage.manage_at_link', ['link' => cachet_route('subscribe.manage', $notifiable->verify_code)])); } diff --git a/app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php b/app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php index ff98b4b4..d5bca3f2 100644 --- a/app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php +++ b/app/Notifications/IncidentUpdate/IncidentUpdatedNotification.php @@ -82,7 +82,7 @@ class IncidentUpdatedNotification extends Notification ])) ->line($content) ->action(trans('notifications.incident.update.mail.action'), cachet_route('incident', [$this->update->incident])) - ->line($this->update->message) + ->line($this->update->raw_message) ->line(trans('cachet.subscriber.unsubscribe', ['link' => cachet_route('subscribe.unsubscribe', $notifiable->verify_code)])) ->line(trans('cachet.subscriber.manage.manage_at_link', ['link' => cachet_route('subscribe.manage', $notifiable->verify_code)])); }