From 86480a0d1a39e0ddf66cb6033dac98c1adb8b797 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 20 Sep 2017 16:44:03 +0930 Subject: [PATCH 1/2] Update for display names --- extensions/subscriptions/views/emails/newPost.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/subscriptions/views/emails/newPost.blade.php b/extensions/subscriptions/views/emails/newPost.blade.php index c19b33bfe..94f5b286b 100644 --- a/extensions/subscriptions/views/emails/newPost.blade.php +++ b/extensions/subscriptions/views/emails/newPost.blade.php @@ -1,6 +1,6 @@ -Hey {{ $user->username }}! +Hey {{ $user->display_name }}! -{{ $blueprint->post->user->username }} made a post in a discussion you're following: {{ $blueprint->post->discussion->title }} +{{ $blueprint->post->user->display_name }} made a post in a discussion you're following: {{ $blueprint->post->discussion->title }} To view the new activity, check out the following link: {{ app()->url() }}/d/{{ $blueprint->post->discussion_id }}/{{ $blueprint->post->number }} From a95a89cb58142cbda12feac9d71d9214053eb5f1 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 5 Nov 2017 15:29:29 +1030 Subject: [PATCH 2/2] Don't sanitize values in plain-text emails --- extensions/subscriptions/views/emails/newPost.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/subscriptions/views/emails/newPost.blade.php b/extensions/subscriptions/views/emails/newPost.blade.php index 94f5b286b..aad6f1975 100644 --- a/extensions/subscriptions/views/emails/newPost.blade.php +++ b/extensions/subscriptions/views/emails/newPost.blade.php @@ -1,13 +1,13 @@ -Hey {{ $user->display_name }}! +Hey {!! $user->display_name !!}! -{{ $blueprint->post->user->display_name }} made a post in a discussion you're following: {{ $blueprint->post->discussion->title }} +{!! $blueprint->post->user->display_name !!} made a post in a discussion you're following: {!! $blueprint->post->discussion->title !!} To view the new activity, check out the following link: -{{ app()->url() }}/d/{{ $blueprint->post->discussion_id }}/{{ $blueprint->post->number }} +{!! app()->url() !!}/d/{!! $blueprint->post->discussion_id !!}/{!! $blueprint->post->number !!} --- -{{ strip_tags($blueprint->post->contentHtml) }} +{!! strip_tags($blueprint->post->contentHtml) !!} ---