Bug #88847 ยป 88847.diff
| typo3/sysext/core/Classes/Site/Entity/Site.php | ||
|---|---|---|
|
* @param array|null $baseVariants
|
||
|
* @return string
|
||
|
*/
|
||
|
protected function resolveBaseWithVariants(string $baseUrl, ?array $baseVariants): string
|
||
|
public function resolveBaseWithVariants(string $baseUrl, ?array $baseVariants): string
|
||
|
{
|
||
|
if (!empty($baseVariants)) {
|
||
|
$expressionLanguageResolver = GeneralUtility::makeInstance(
|
||
| typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php | ||
|---|---|---|
|
use Psr\Container\ContainerInterface;
|
||
|
use Psr\Log\LoggerAwareInterface;
|
||
|
use Psr\Log\LoggerAwareTrait;
|
||
|
use Symfony\Component\ExpressionLanguage\SyntaxError;
|
||
|
use Symfony\Component\Mime\NamedAddress;
|
||
|
use TYPO3\CMS\Core\Cache\CacheManager;
|
||
|
use TYPO3\CMS\Core\Context\Context;
|
||
| ... | ... | |
|
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
|
||
|
use TYPO3\CMS\Core\Database\Query\Restriction\FrontendRestrictionContainer;
|
||
|
use TYPO3\CMS\Core\Domain\Repository\PageRepository;
|
||
|
use TYPO3\CMS\Core\ExpressionLanguage\Resolver;
|
||
|
use TYPO3\CMS\Core\Html\HtmlParser;
|
||
|
use TYPO3\CMS\Core\Imaging\ImageManipulation\Area;
|
||
|
use TYPO3\CMS\Core\Imaging\ImageManipulation\CropVariantCollection;
|
||
| ... | ... | |
|
} else {
|
||
|
try {
|
||
|
$retVal = ArrayUtility::getValueByPath($site->getConfiguration(), $key, '.');
|
||
|
if ($key === 'base') {
|
||
|
$retVal = $site->resolveBaseWithVariants(
|
||
|
$site->getBase(),
|
||
|
$site->getConfiguration()['baseVariants'] ?? null
|
||
|
);
|
||
|
}
|
||
|
} catch (MissingArrayPathException $exception) {
|
||
|
$this->logger->warning(sprintf('getData() with "%s" failed', $key), ['exception' => $exception]);
|
||
|
}
|
||