From fa748fd74c96e7b8ac46218bada7ab17981d0df0 Mon Sep 17 00:00:00 2001
From: Guillaume Heurtier <guillaume.heurtier@maarch.org>
Date: Thu, 19 Sep 2019 10:43:32 +0200
Subject: [PATCH] FIX #11487 TIME 0:40 remove extra ',' in custom lang file if
needed
---
src/core/models/CoreConfigModel.php | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/core/models/CoreConfigModel.php b/src/core/models/CoreConfigModel.php
index 299c1ce9b51..1ce9ade45d4 100755
--- a/src/core/models/CoreConfigModel.php
+++ b/src/core/models/CoreConfigModel.php
@@ -115,7 +115,16 @@ class CoreConfigModel
$strpos = strpos($fileContent, "=");
$substr = substr(trim($fileContent), $strpos + 2, -1);
- return json_decode($substr);
+ $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);
+ }
+
+ return $decode;
}
return '';
--
GitLab