diff --git a/typo3/sysext/adminpanel/Classes/Service/ConfigurationService.php b/typo3/sysext/adminpanel/Classes/Service/ConfigurationService.php index 930aca99ddac1c579c0ca15f105244c4cc520553..320f730fa5c6f69d4f164436c4a40765aa593c70 100644 --- a/typo3/sysext/adminpanel/Classes/Service/ConfigurationService.php +++ b/typo3/sysext/adminpanel/Classes/Service/ConfigurationService.php @@ -32,19 +32,12 @@ use TYPO3\CMS\Core\SingletonInterface; */ class ConfigurationService implements SingletonInterface { - protected array $mainConfiguration; - - public function __construct() - { - $this->mainConfiguration = $this->getBackendUser()->getTSConfig()['admPanel.'] ?? []; - } - /** * Get MainConfiguration (User TSConfig admPanel) */ public function getMainConfiguration(): array { - return $this->mainConfiguration; + return $this->getBackendUser()->getTSConfig()['admPanel.'] ?? []; } /** @@ -57,11 +50,7 @@ class ConfigurationService implements SingletonInterface throw new \InvalidArgumentException('Identifier and option may not be empty', 1532861423); } - if (isset($this->mainConfiguration['override.'][$identifier . '.'][$option])) { - $returnValue = $this->mainConfiguration['override.'][$identifier . '.'][$option]; - } else { - $returnValue = $this->getBackendUser()->uc['AdminPanel'][$identifier . '_' . $option] ?? ''; - } + $returnValue = $this->getMainConfiguration()['override.'][$identifier . '.'][$option] ?? $this->getBackendUser()->uc['AdminPanel'][$identifier . '_' . $option] ?? ''; return (string)$returnValue; }