Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorVincent Petry <vincent@nextcloud.com>2022-06-10 16:31:58 +0300
committerGitHub <noreply@github.com>2022-06-10 16:31:58 +0300
commitddac16b6ec35c5f714ff366979e141ba3f2181eb (patch)
treed43b6b01b2f982091d3e8c337b3f84c077a36f0a /lib
parent535b84e4e69d09ac3fb5d994c778325844dbe4fb (diff)
parent26050a48f0e84dd31287bd78a88ef4c90c915aed (diff)
Merge pull request #32657 from nextcloud/backport/32655/stable24
[stable24] Handle non existing settings again
Diffstat (limited to 'lib')
-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();