From 78330ec3832850eba1b22050af7bf1d89f17efeb Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Fri, 24 Nov 2017 23:27:52 +0100
Subject: [PATCH] [TASK] Use general functionality for fetching templates
Some places in the TYPO3 Core can use the general coding functionality
to fetch absolute URLs, but "GeneralUtility::getFileAbsFileName" should
be used in these places.
Resolves: #83084
Releases: master
Change-Id: Ic723060b4b01eac51256d54e619a7770e0ad65fa
Reviewed-on: https://review.typo3.org/54753
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: Susanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
---
.../backend/Classes/Template/DocumentTemplate.php | 14 ++------------
.../ContentObject/FluidTemplateContentObject.php | 7 +++----
.../FluidTemplateContentObjectTest.php | 11 ++---------
3 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
index dd9e90a53836..9d05214a5328 100644
--- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
@@ -741,18 +741,8 @@ function jumpToUrl(URL) {
if ($GLOBALS['TBE_STYLES']['htmlTemplates'][$filename]) {
$filename = $GLOBALS['TBE_STYLES']['htmlTemplates'][$filename];
}
- if (GeneralUtility::isFirstPartOfStr($filename, 'EXT:')) {
- $filename = GeneralUtility::getFileAbsFileName($filename);
- } elseif (!GeneralUtility::isAbsPath($filename)) {
- $filename = GeneralUtility::resolveBackPath($filename);
- } elseif (!GeneralUtility::isAllowedAbsPath($filename)) {
- $filename = '';
- }
- $htmlTemplate = '';
- if ($filename !== '') {
- $htmlTemplate = file_get_contents($filename);
- }
- return $htmlTemplate;
+ $filename = GeneralUtility::getFileAbsFileName($filename);
+ return $filename !== '' ? file_get_contents($filename) : '';
}
/**
diff --git a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
index dbc3d29f6e39..85cae47c41e9 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
@@ -173,10 +173,9 @@ class FluidTemplateContentObject extends AbstractContentObject
} else {
// Fetch the Fluid template by file stdWrap
$file = isset($conf['file.']) ? $this->cObj->stdWrap($conf['file'], $conf['file.']) : $conf['file'];
- /** @var $templateService \TYPO3\CMS\Core\TypoScript\TemplateService */
- $templateService = $GLOBALS['TSFE']->tmpl;
- $templatePathAndFilename = $templateService->getFileName($file);
- $this->view->setTemplatePathAndFilename(PATH_site . $templatePathAndFilename);
+ // Get the absolute file name
+ $templatePathAndFilename = GeneralUtility::getFileAbsFileName($file);
+ $this->view->setTemplatePathAndFilename($templatePathAndFilename);
}
}
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
index 54fe0a87fdc9..b4e4ac720b86 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
@@ -181,18 +181,11 @@ class FluidTemplateContentObjectTest extends \TYPO3\TestingFramework\Core\Unit\U
public function renderSetsTemplateFileInView()
{
$this->addMockViewToSubject();
- /** @var $templateService \PHPUnit_Framework_MockObject_MockObject */
- $templateService = $GLOBALS['TSFE']->tmpl;
- $templateService
- ->expects($this->any())
- ->method('getFileName')
- ->with('foo')
- ->will($this->returnValue('bar'));
$this->standaloneView
->expects($this->any())
->method('setTemplatePathAndFilename')
- ->with(PATH_site . 'bar');
- $this->subject->render(['file' => 'foo']);
+ ->with(PATH_site . 'typo3/sysext/core/bar.html');
+ $this->subject->render(['file' => 'EXT:core/bar.html']);
}
/**
--
GitLab