fix: allow disabling greeting from email blade template

flarum · Sep 29, 2023 · 499f203 · 499f203
1 parent c4901f7
commit 499f203
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/framework/core/src/Forum/ForumServiceProvider.php b/framework/core/src/Forum/ForumServiceProvider.php
@@ -149,8 +149,6 @@ public function boot(Container $container, Dispatcher $events, Factory $view): v
             'translator' => $container->make(TranslatorInterface::class),
             'settings' => $container->make(SettingsRepositoryInterface::class),
             'formatter' => $container->make(Formatter::class),
-            'greeting' => true,
-            'signofff' => true
         ]);
 
         $events->listen(

diff --git a/framework/core/views/email/html/base.blade.php b/framework/core/views/email/html/base.blade.php
@@ -61,18 +61,18 @@
 </div>
 
 <div class="content">
-    @if(isset($greeting) && $greeting !== false)
-    <div class="greeting">
-        <p>{!! $translator->trans('core.email.greeting', ['displayName' => $username]) !!}</p>
-    </div>
+    @if(!isset($greeting) || $greeting !== false)
+        <div class="greeting">
+            <p>{!! $translator->trans('core.email.greeting', ['displayName' => $username]) !!}</p>
+        </div>
     @endif
     <div class="main-content">
         @yield('content')
     </div>
-    @if(isset($signoff) && $signoff !== false)
-    <div class="signoff">
-        <p>{!! $translator->trans('core.email.signoff', ['forumTitle' => $settings->get('forum_title')]) !!}</p>
-    </div>
+    @if(!isset($signoff) || $signoff !== false)
+        <div class="signoff">
+            <p>{!! $translator->trans('core.email.signoff', ['forumTitle' => $settings->get('forum_title')]) !!}</p>
+        </div>
     @endif
 </div>
 

diff --git a/framework/core/views/email/plain/base.blade.php b/framework/core/views/email/plain/base.blade.php
@@ -1,12 +1,12 @@
 @yield('header')
 
-@if(isset($greeting) && $greeting !== false)
+@if(!isset($greeting) || $greeting !== false)
 {{ $translator->trans('core.email.greeting', ['displayName' => $username]) }}
 @endif
 
 @yield('content')
 
-@if(isset($signoff) && $signoff !== false)
+@if(!isset($signoff) || $signoff !== false)
 - {{ $translator->trans('core.email.signoff', ['forumTitle' => $settings->get('forum_title')]) }} -
 @endif