From c494a0cc63d1079951c854f0412b0f6f58b57078 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 9 Jun 2024 09:36:32 -0400 Subject: [PATCH] fix(AppManager): Name correct method in error + show error string Signed-off-by: Josh --- lib/private/App/AppManager.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php index 99d1c913cedc0..0786fbded20fd 100644 --- a/lib/private/App/AppManager.php +++ b/lib/private/App/AppManager.php @@ -319,7 +319,9 @@ private function checkAppForUser(string $enabled, ?IUser $user): bool { if (!is_array($groupIds)) { $jsonError = json_last_error(); - $this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError); + $jsonErrorMsg = json_last_error_msg(); + // this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason) + $this->logger->warning('AppManager::checkAppForUser - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg); return false; } @@ -345,7 +347,9 @@ private function checkAppForGroups(string $enabled, IGroup $group): bool { if (!is_array($groupIds)) { $jsonError = json_last_error(); - $this->logger->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError); + $jsonErrorMsg = json_last_error_msg(); + // this really should never happen (if it does, the admin should check the `enabled` key value via `occ config:list` because it's bogus for some reason) + $this->logger->warning('AppManager::checkAppForGroups - can\'t decode group IDs listed in app\'s enabled config key: ' . print_r($enabled, true) . ' - JSON error (' . $jsonError . ') ' . $jsonErrorMsg); return false; }