From c0b8087c7505315c3616edfdd135bda4e44b08a8 Mon Sep 17 00:00:00 2001
From: Paul Ilea <paul@sgalinski.de>
Date: Thu, 15 Jun 2017 12:04:53 +0300
Subject: [PATCH] [TASK] typo3v8 compatibility updates
---
Classes/ViewHelpers/ExtendedIfViewHelper.php | 9 ++++++---
Configuration/TypoScript/Frontend/setup.txt | 10 ++++++++++
Resources/Private/Partials/Teaser.html | 2 +-
Resources/Private/Partials/TeaserOverview.html | 2 +-
Resources/Private/Templates/ListByCategory/Index.html | 2 +-
Resources/Private/Templates/Overview/Overview.html | 2 +-
.../Templates/Overview/OverviewWithoutCategories.html | 2 +-
7 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/Classes/ViewHelpers/ExtendedIfViewHelper.php b/Classes/ViewHelpers/ExtendedIfViewHelper.php
index 8dd5e32..15bdd04 100644
--- a/Classes/ViewHelpers/ExtendedIfViewHelper.php
+++ b/Classes/ViewHelpers/ExtendedIfViewHelper.php
@@ -26,6 +26,7 @@ namespace SGalinski\SgNews\ViewHelpers;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractConditionViewHelper;
/**
@@ -37,9 +38,11 @@ class ExtendedIfViewHelper extends AbstractConditionViewHelper {
*/
public function initializeArguments() {
parent::initializeArguments();
- $this->registerArgument(
- 'condition', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
- );
+ if(VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version) < 8000000) {
+ $this->registerArgument(
+ 'condition', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
+ );
+ }
$this->registerArgument(
'or', 'boolean', 'Condition expression conforming to Fluid boolean rules', FALSE, FALSE
);
diff --git a/Configuration/TypoScript/Frontend/setup.txt b/Configuration/TypoScript/Frontend/setup.txt
index 0662455..6917a7e 100644
--- a/Configuration/TypoScript/Frontend/setup.txt
+++ b/Configuration/TypoScript/Frontend/setup.txt
@@ -36,6 +36,16 @@ newsFeed {
}
}
+[compatVersion = 7.6.0]
+ newsFeed.config.additionalHeaders >
+ newsFeed.config.additionalHeaders {
+ 10 {
+ header = Content-type:text/xml
+ replace = 1
+ }
+ }
+[global]
+
# news feed integration into the site
page.headerData {
273905123652 = TEXT
diff --git a/Resources/Private/Partials/Teaser.html b/Resources/Private/Partials/Teaser.html
index a22e578..0f7dc58 100644
--- a/Resources/Private/Partials/Teaser.html
+++ b/Resources/Private/Partials/Teaser.html
@@ -22,7 +22,7 @@
<f:alias map="{singleViewUri: '{f:uri.page(pageUid: \'{newsMetaData.news.uid}\')}'}">
<a href="{singleViewUri}">
<f:if condition="{newsMetaData.teaserImageObject}">
- <div class="tx-sgnews-teaser-image tx-sgnews-teaser-image-stretched" style="background-image: url({f:uri.image(image: '{newsMetaData.teaserImageObject}')});"></div>
+ <div class="tx-sgnews-teaser-image tx-sgnews-teaser-image-stretched" style="background-image: url({f:uri.image(image: newsMetaData.teaserImageObject)});"></div>
</f:if>
<div class="tx-sgnews-teaser-inner">
<div class="tx-sgnews-teaser-title">
diff --git a/Resources/Private/Partials/TeaserOverview.html b/Resources/Private/Partials/TeaserOverview.html
index de7685f..2f9288b 100644
--- a/Resources/Private/Partials/TeaserOverview.html
+++ b/Resources/Private/Partials/TeaserOverview.html
@@ -1,6 +1,6 @@
{namespace sg=SGalinski\SgNews\ViewHelpers}
-<f:comment xmlns:f="http://www.w3.org/1999/html">
+<f:comment>
<!--
Usage Example:
diff --git a/Resources/Private/Templates/ListByCategory/Index.html b/Resources/Private/Templates/ListByCategory/Index.html
index 35795fd..29ca35f 100644
--- a/Resources/Private/Templates/ListByCategory/Index.html
+++ b/Resources/Private/Templates/ListByCategory/Index.html
@@ -26,7 +26,7 @@
</f:for>
</ul>
- <sg:pageBrowser numberOfPages="{numberOfPages}" />
+ <f:format.raw><sg:pageBrowser numberOfPages="{numberOfPages}" /></f:format.raw>
</div>
</section>
</f:section>
diff --git a/Resources/Private/Templates/Overview/Overview.html b/Resources/Private/Templates/Overview/Overview.html
index c69e01c..06cd3dd 100644
--- a/Resources/Private/Templates/Overview/Overview.html
+++ b/Resources/Private/Templates/Overview/Overview.html
@@ -70,5 +70,5 @@
</div>
</div>
- <sg:pageBrowser numberOfPages="{numberOfPages}" />
+ <f:format.raw><sg:pageBrowser numberOfPages="{numberOfPages}" /></f:format.raw>
</f:section>
diff --git a/Resources/Private/Templates/Overview/OverviewWithoutCategories.html b/Resources/Private/Templates/Overview/OverviewWithoutCategories.html
index f8be579..4eea371 100644
--- a/Resources/Private/Templates/Overview/OverviewWithoutCategories.html
+++ b/Resources/Private/Templates/Overview/OverviewWithoutCategories.html
@@ -18,5 +18,5 @@
</ul>
</div>
- <sg:pageBrowser numberOfPages="{numberOfPages}" />
+ <f:format.raw><sg:pageBrowser numberOfPages="{numberOfPages}" /></f:format.raw>
</f:section>
\ No newline at end of file
--
GitLab