Skip to content

Commit

Permalink
Revert "Use Markdown in mail notifications. Fixes #2935"
Browse files Browse the repository at this point in the history
This reverts commit d4cd685.
  • Loading branch information
jbrooksuk committed Mar 27, 2018
1 parent d87197a commit 0c96e67
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/Notifications/Incident/NewIncidentNotification.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function toMail($notifiable)
->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]))
->markdown($this->incident->message)
->line($this->incident->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)]));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public function toMail($notifiable)
]))
->line($content)
->action(trans('notifications.incident.update.mail.action'), cachet_route('incident', [$this->update->incident]))
->markdown($this->update->message)
->line($this->update->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)]));
}
Expand Down

2 comments on commit 0c96e67

@uxen-ab
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The markdown message was for #2935. What was the problem with it? And is the message interpreted as markdown?

@jbrooksuk
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it was but it turns out I hadn't used markdown properly. We're supposed to supply a view file. What we now do is supply the raw message, so it's stripped of any HTML/Markdown d63b9b2

Please sign in to comment.