summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Schwan <carl@carlschwan.eu>2022-05-30 10:50:21 +0200
committerbackportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com>2022-05-30 11:01:19 +0000
commit626ae0c1bb87ee1d0fffee21b73aaa75be4c6cf7 (patch)
tree430bf49c515f3c0075ddb00baca0720182d5d26e
parent9a499a2f63525631a05ea07846c19a16fba097dc (diff)
downloadnextcloud-server-626ae0c1bb87ee1d0fffee21b73aaa75be4c6cf7.tar.gz
nextcloud-server-626ae0c1bb87ee1d0fffee21b73aaa75be4c6cf7.zip
Handle non existing settings again
See https://github.com/nextcloud/server/pull/28189#issuecomment-1140874991 Signed-off-by: Carl Schwan <carl@carlschwan.eu>
-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();