diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Settings/Manager.php | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 260e33d1929..f1baf35b7ab 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -133,7 +133,11 @@ class Manager implements IManager { * @return void */ public function registerSection(string $type, string $section) { - $this->sectionClasses[$section] = $type; + if (!isset($this->sectionClasses[$type])) { + $this->sectionClasses[$type] = []; + } + + $this->sectionClasses[$type][] = $section; } /** @@ -145,7 +149,11 @@ class Manager implements IManager { $this->sections[$type] = []; } - foreach ($this->sectionClasses as $class => $sectionType) { + if (!isset($this->sectionClasses[$type])) { + return $this->sections[$type]; + } + + foreach ($this->sectionClasses[$type] as $index => $class) { try { /** @var ISection $section */ $section = \OC::$server->query($class); @@ -159,9 +167,16 @@ class Manager implements IManager { continue; } - $this->sections[$sectionType][$section->getID()] = $section; + $sectionID = $section->getID(); + + if (isset($this->sections[$type][$sectionID])) { + $this->log->logException(new \InvalidArgumentException('Section with the same ID already registered'), ['level' => ILogger::INFO]); + continue; + } + + $this->sections[$type][$sectionID] = $section; - unset($this->sectionClasses[$class]); + unset($this->sectionClasses[$type][$index]); } return $this->sections[$type]; |