From 80f19f936ca41b91ee5a11ca9f545c30b63f1fad Mon Sep 17 00:00:00 2001 From: maxpozdeev Date: Tue, 28 Mar 2023 23:15:06 +0300 Subject: [PATCH] -fix: handle incorrect json in settings --- src/includes/class.config.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/includes/class.config.php b/src/includes/class.config.php index 4159542..028e6d2 100644 --- a/src/includes/class.config.php +++ b/src/includes/class.config.php @@ -218,13 +218,13 @@ class Config * @return array * @throws Exception */ - public static function requestDomain(string $key) + public static function requestDomain(string $key): array { $db = DBConnection::instance(); $json = $db->sq("SELECT param_value FROM {$db->prefix}settings WHERE param_key = ?", array($key)); if (!$json) return array(); $j = json_decode($json, true, 100, JSON_INVALID_UTF8_SUBSTITUTE); - if ($j === false) { + if ($j === null) { error_log("MTT Error: Failed to decode JSON object with settings. Code: ". (int)json_last_error()); return array(); } @@ -237,7 +237,7 @@ class Config * @return array * @throws Exception */ - public static function requestDefaultDomain() + public static function requestDefaultDomain(): array { return self::requestDomain('config.json'); }