From f956ef0212ed8917a6ed72b8333edd6151c33e4d Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Mon, 23 Sep 2019 15:32:58 +0200
Subject: [PATCH] FIX #11487 TIME 0:45 now using rtrim to remove extra ',' in
custom lang
---
src/core/models/CoreConfigModel.php | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/core/models/CoreConfigModel.php b/src/core/models/CoreConfigModel.php
index 1ce9ade45d4..3d23d7b09f1 100755
--- a/src/core/models/CoreConfigModel.php
+++ b/src/core/models/CoreConfigModel.php
@@ -115,14 +115,10 @@ class CoreConfigModel
$strpos = strpos($fileContent, "=");
$substr = substr(trim($fileContent), $strpos + 2, -1);
- $decode = json_decode($substr);
- if (json_last_error() != JSON_ERROR_NONE) {
- // decoded String is not a valid JSON String, probably because of an extra ',' at the end
- $correctedString = substr_replace($substr, '', strlen($substr) - 2, 1);
-
- $decode = json_decode($correctedString);
- }
+ $trimmed = rtrim($substr, ',}');
+ $trimmed .= '}';
+ $decode = json_decode($trimmed);
return $decode;
}
--
GitLab