Преглед на файлове

ignore duplicate setting sections

this prevents some 'Section with the same ID already registered' errors in the log

also includes an improvement of the error message to make other cases easier to find

Signed-off-by: Robin Appelman <robin@icewind.nl>
tags/v20.0.0beta3
Robin Appelman преди 3 години
родител
ревизия
eb4154cee0
No account linked to committer's email address
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2
    2
      lib/private/Settings/Manager.php

+ 2
- 2
lib/private/Settings/Manager.php Целия файл

@@ -106,7 +106,7 @@ class Manager implements IManager {
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 @@ class Manager implements IManager {
$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;
}


Loading…
Отказ
Запис