Merge pull request #22476 from nextcloud/setting-sections-unique

ignore duplicate setting sections
nextcloud · Aug 30, 2020 · c43189b · c43189b
2 parents 5d4c4b5 + eb4154c
commit c43189b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
@@ -106,7 +106,7 @@ protected function getSections(string $type): array {
 			return $this->sections[$type];
 		}
 
-		foreach ($this->sectionClasses[$type] as $index => $class) {
+		foreach (array_unique($this->sectionClasses[$type]) as $index => $class) {
 			try {
 				/** @var ISection $section */
 				$section = \OC::$server->query($class);
@@ -123,7 +123,7 @@ protected function getSections(string $type): array {
 			$sectionID = $section->getID();
 
 			if (isset($this->sections[$type][$sectionID])) {
-				$this->log->logException(new \InvalidArgumentException('Section with the same ID already registered'), ['level' => ILogger::INFO]);
+				$this->log->logException(new \InvalidArgumentException('Section with the same ID already registered: ' . $sectionID . ', class: ' . $class), ['level' => ILogger::INFO]);
 				continue;
 			}