Merge branch '4.x' into 5981-fix-contact-null

monicahq · Oct 31, 2023 · 026bf5b · 026bf5b
2 parents 5fe9220 + 3799ab5
commit 026bf5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
@@ -59,7 +59,9 @@ public function index()
         if (auth()->user()->me_contact_id) {
             $meContact = Contact::where('account_id', auth()->user()->account_id)
                 ->find(auth()->user()->me_contact_id);
-            $existingContacts->prepend($meContact);
+            if ($meContact) {
+                $existingContacts->prepend($meContact);
+            }
         }
 
         $accountHasLimitations = AccountHelper::hasLimitations(auth()->user()->account);

diff --git a/config/mail.php b/config/mail.php
@@ -57,7 +57,7 @@
 
         'sendmail' => [
             'transport' => 'sendmail',
-            'path' => '/usr/sbin/sendmail -bs',
+            'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
         ],
 
         'log' => [

diff --git a/phpstan.neon b/phpstan.neon
@@ -48,3 +48,5 @@ parameters:
         - */Http/Resources/**/*.php
         - */ExportResources/**/*.php
         - */ExportResources/*.php
+        - */Console/Commands/ImportAccounts.php
+