From cc76c02d4219d9239425fce9a8060f1b8adb3639 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 24 Nov 2023 14:35:56 +1100
Subject: [PATCH] v5.7.54

---
 VERSION.txt                                  | 2 +-
 app/Http/Controllers/EmailController.php     | 2 +-
 app/Http/Requests/Email/SendEmailRequest.php | 2 +-
 config/ninja.php                             | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index 98525ccee1..3c665e5ccf 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.7.53
\ No newline at end of file
+5.7.54
\ No newline at end of file
diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php
index 76b0634e85..f5f74685b4 100644
--- a/app/Http/Controllers/EmailController.php
+++ b/app/Http/Controllers/EmailController.php
@@ -69,7 +69,7 @@ class EmailController extends BaseController
         /** @var \App\Models\User $user */
         $user = auth()->user();
 
-        if ($request->has('cc_email') && (Ninja::isSelfHost() || $user->account->isPaidHostedClient())) {
+        if ($request->cc_email && (Ninja::isSelfHost() || $user->account->isPaidHostedClient())) {
  
             foreach($request->cc_email as $email)
                 $mo->cc[] = new Address($email);
diff --git a/app/Http/Requests/Email/SendEmailRequest.php b/app/Http/Requests/Email/SendEmailRequest.php
index 93b25a9ad5..7ab733014f 100644
--- a/app/Http/Requests/Email/SendEmailRequest.php
+++ b/app/Http/Requests/Email/SendEmailRequest.php
@@ -43,7 +43,7 @@ class SendEmailRequest extends Request
             'template' => 'bail|required',
             'entity' => 'bail|required',
             'entity_id' => 'bail|required',
-            'cc_email.*' => 'bail|sometimes|email|nullable',
+            'cc_email.*' => 'bail|sometimes|email',
         ];
 
 
diff --git a/config/ninja.php b/config/ninja.php
index 5fa529987b..be246ea105 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -17,8 +17,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => env('APP_VERSION','5.7.53'),
-    'app_tag' => env('APP_TAG','5.7.53'),
+    'app_version' => env('APP_VERSION','5.7.54'),
+    'app_tag' => env('APP_TAG','5.7.54'),
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', false),