Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 04:17:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8992 from turbo124/v5-develop

Browse Source 
v5.7.54
This commit is contained in:
David Bomba 2023-11-24 14:36:28 +11:00 committed by GitHub
commit c1fef3db4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.7.53 5.7.54

2
app/Http/Controllers/EmailController.php
View File

@ -69,7 +69,7 @@ class EmailController extends BaseController
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->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) foreach($request->cc_email as $email)
$mo->cc[] = new Address($email); $mo->cc[] = new Address($email);

2
app/Http/Requests/Email/SendEmailRequest.php
View File

@ -43,7 +43,7 @@ class SendEmailRequest extends Request
'template' => 'bail|required', 'template' => 'bail|required',
'entity' => 'bail|required', 'entity' => 'bail|required',
'entity_id' => 'bail|required', 'entity_id' => 'bail|required',
'cc_email.*' => 'bail|sometimes|email|nullable', 'cc_email.*' => 'bail|sometimes|email',
]; ];

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION','5.7.53'), 'app_version' => env('APP_VERSION','5.7.54'),
'app_tag' => env('APP_TAG','5.7.53'), 'app_tag' => env('APP_TAG','5.7.54'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),