Просмотр исходного кода

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 лет назад
Родитель
Сommit
eb4154cee0
Аккаунт пользователя с таким Email не найден
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;
}


Загрузка…
Отмена
Сохранить