From 267640cf6701dec12d95dbc5b0ff089ad2fe18f3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 13 Jan 2021 07:22:15 +1100 Subject: [PATCH 1/2] 5.0.46 --- VERSION.txt | 2 +- config/ninja.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 27ade18d23..0a8951789b 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.0.45 \ No newline at end of file +5.0.46 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index 31204832b2..32b9e879f0 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.0.45', + 'app_version' => '5.0.46', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false), From e0c995a8b391dfef520ac80d6d99996c964ddfa5 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 13 Jan 2021 07:40:49 +1100 Subject: [PATCH 2/2] Fix for trailing $ in default templates --- app/DataMapper/EmailTemplateDefaults.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php index a9c253da0b..d664796585 100644 --- a/app/DataMapper/EmailTemplateDefaults.php +++ b/app/DataMapper/EmailTemplateDefaults.php @@ -223,6 +223,9 @@ class EmailTemplateDefaults private static function transformText($string) { + //preformat the string, removing trailing colons. + $string = rtrim($string, ":"); + return str_replace(':', '$', ctrans('texts.'.$string)); } }