summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Schwan <carl@carlschwan.eu>2022-05-30 12:53:36 +0200
committerGitHub <noreply@github.com>2022-05-30 12:53:36 +0200
commite86bcc8953eb4cefbd069aac1ff9913669ebaf0f (patch)
treeb542d428fccdb33987e036ede6619287656e6a30
parent72bb8f6c3155e63bc86637e3beacf21bc807bb1c (diff)
parent63f589109bb114f285ad64ce8bc5a9ddbc4521e9 (diff)
downloadnextcloud-server-e86bcc8953eb4cefbd069aac1ff9913669ebaf0f.tar.gz
nextcloud-server-e86bcc8953eb4cefbd069aac1ff9913669ebaf0f.zip
Merge pull request #32655 from nextcloud/fix/handle-non-existing-settings
Handle non existing settings again
-rw-r--r--lib/private/Settings/Manager.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index 84fbf9426b0..05a286e4758 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -126,8 +126,13 @@ class Manager implements IManager {
}
foreach (array_unique($this->sectionClasses[$type]) as $index => $class) {
- /** @var IIconSection $section */
- $section = \OC::$server->get($class);
+ try {
+ /** @var IIconSection $section */
+ $section = $this->container->get($class);
+ } catch (QueryException $e) {
+ $this->log->info($e->getMessage(), ['exception' => $e]);
+ continue;
+ }
$sectionID = $section->getID();