[BUGFIX] Fix calling checkIncludeLines non statically in BackendLayoutView 39/57939/2
authorWouter Wolters <typo3@wouterwolters.nl>
Thu, 16 Aug 2018 21:19:51 +0000 (23:19 +0200)
committerJan Helke <typo3@helke.de>
Fri, 17 Aug 2018 08:32:06 +0000 (10:32 +0200)
The method checkIncludeLines in TypoScriptParser should be called
statically in the class BackendLayoutView.

Resolves: #85882
Releases: master,8.7
Change-Id: Ib774ee41528741953576acb82f046ed45e7acc75
Reviewed-on: https://review.typo3.org/57939
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: Jan Helke <typo3@helke.de>
typo3/sysext/backend/Classes/View/BackendLayoutView.php

index 34deb7e..9075815 100644 (file)
@@ -16,6 +16,7 @@ namespace TYPO3\CMS\Backend\View;
 
 use TYPO3\CMS\Backend\Utility\BackendUtility;
 use TYPO3\CMS\Core\Database\ConnectionPool;
+use TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser;
 use TYPO3\CMS\Core\Utility\ArrayUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
@@ -352,11 +353,11 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface
         }
 
         if (!empty($backendLayout)) {
-            /** @var $parser \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser */
-            $parser = GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::class);
+            /** @var $parser TypoScriptParser */
+            $parser = GeneralUtility::makeInstance(TypoScriptParser::class);
             /** @var \TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher $conditionMatcher */
             $conditionMatcher = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher::class);
-            $parser->parse($parser->checkIncludeLines($backendLayout->getConfiguration()), $conditionMatcher);
+            $parser->parse(TypoScriptParser::checkIncludeLines($backendLayout->getConfiguration()), $conditionMatcher);
 
             $backendLayoutData = [];
             $backendLayoutData['config'] = $backendLayout->getConfiguration();