From e2bc086f75545a5c56a7afc2290ee9b37fbff748 Mon Sep 17 00:00:00 2001 From: = Date: Sat, 13 Mar 2021 19:36:00 +1100 Subject: [PATCH 1/2] Type check on custom fields --- app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php index c27e68fc3130..9258740c0122 100644 --- a/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php +++ b/app/Services/PdfMaker/Designs/Utilities/DesignHelpers.php @@ -289,7 +289,7 @@ trait DesignHelpers return ''; } - if (!property_exists($this->client->company->custom_fields, $field)) { + if ($this->client->company->custom_fields && !property_exists($this->client->company->custom_fields, $field)) { return ''; } From 7793f627c5dba1279a7b3644fc83f7dffd119bcb Mon Sep 17 00:00:00 2001 From: = Date: Sat, 13 Mar 2021 19:50:35 +1100 Subject: [PATCH 2/2] 5.1.24 --- VERSION.txt | 2 +- config/ninja.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 888d58e98aa3..ee09acc6eceb 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.1.23 \ No newline at end of file +5.1.24 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 47eb9795f150..6b1a7997cf06 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -13,7 +13,7 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.1.23', + 'app_version' => '5.1.24', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),