aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private/App
diff options
context:
space:
mode:
authorJosh <josh.t.richards@gmail.com>2024-06-09 09:36:32 -0400
committerGitHub <noreply@github.com>2024-06-09 09:36:32 -0400
commitc494a0cc63d1079951c854f0412b0f6f58b57078 (patch)
tree7203afddddae011a9cb559fdd21de9de8a64ebd1 /lib/private/App
parent1a6440c353d3c797140215e4ab885544f1ac3741 (diff)
downloadnextcloud-server-c494a0cc63d1079951c854f0412b0f6f58b57078.tar.gz
nextcloud-server-c494a0cc63d1079951c854f0412b0f6f58b57078.zip
fix(AppManager): Name correct method in error + show error string
Signed-off-by: Josh <josh.t.richards@gmail.com>
Diffstat (limited to 'lib/private/App')
-rw-r--r--lib/private/App/AppManager.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 99d1c913ced..0786fbded20 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -319,7 +319,9 @@ class AppManager implements IAppManager {
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 @@ class AppManager implements IAppManager {
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;
}