From 975b7b72c3d92b933a689655d9ca0d094f8190a8 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 28 Jun 2023 12:31:13 +0300 Subject: [PATCH 1/2] dont apply default encoding --- application/Espo/Core/ORM/DatabaseParamsFactory.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/Espo/Core/ORM/DatabaseParamsFactory.php b/application/Espo/Core/ORM/DatabaseParamsFactory.php index 6a38b626f9..b5fcd9cf26 100644 --- a/application/Espo/Core/ORM/DatabaseParamsFactory.php +++ b/application/Espo/Core/ORM/DatabaseParamsFactory.php @@ -37,7 +37,6 @@ use RuntimeException; class DatabaseParamsFactory { private const DEFAULT_PLATFORM = 'Mysql'; - private const DEFAULT_CHARSET = 'utf8'; public function __construct(private Config $config) {} @@ -55,7 +54,7 @@ class DatabaseParamsFactory ->withName($config->get('database.dbname')) ->withUsername($config->get('database.user')) ->withPassword($config->get('database.password')) - ->withCharset($config->get('database.charset') ?? self::DEFAULT_CHARSET) + ->withCharset($config->get('database.charset')) ->withPlatform($config->get('database.platform')) ->withSslCa($config->get('database.sslCA')) ->withSslCert($config->get('database.sslCert')) From b66cb676a17b152810ce7681be634d4751d16400 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Wed, 28 Jun 2023 12:47:42 +0300 Subject: [PATCH 2/2] 7.5.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 32b6dc9f14..779c55ce93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "espocrm", - "version": "7.5.4", + "version": "7.5.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "espocrm", - "version": "7.5.4", + "version": "7.5.5", "hasInstallScript": true, "license": "GPL-3.0", "dependencies": { diff --git a/package.json b/package.json index 474b1f0061..779c684806 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "espocrm", - "version": "7.5.4", + "version": "7.5.5", "description": "Open-source CRM.", "repository": { "type": "git",