Skip to content
Snippets Groups Projects
Commit 35a4c605 authored by Benni Mack's avatar Benni Mack
Browse files

[BUGFIX] Avoid BackendUser access in AdminPanel constructor

Resolves: #100538
Releases: main, 12.4, 11.5
Change-Id: Ia0e37a39ed566938a9b9f947ad21949a9ab3b0bc
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/79612


Tested-by: default avatarcore-ci <typo3@b13.com>
Tested-by: default avatarStefan Bürk <stefan@buerk.tech>
Tested-by: default avatarBenni Mack <benni@typo3.org>
Reviewed-by: default avatarBenni Mack <benni@typo3.org>
Reviewed-by: default avatarStefan Bürk <stefan@buerk.tech>
Reviewed-by: default avatarAndreas Fernandez <a.fernandez@scripting-base.de>
parent f5558dea
Branches
Tags
No related merge requests found
......@@ -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;
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment