From 74e458527518bc1aaf1e0c15e92c6f07cce0d36e Mon Sep 17 00:00:00 2001
From: Paul Ilea <paul@sgalinski.de>
Date: Tue, 13 Jun 2017 14:37:14 +0300
Subject: [PATCH] [TASK] typo3v8 compatibility updates fix ExtendedIf
viewhelper fix FlasMessages viewhelper calls
---
Classes/ViewHelpers/ExtendedIfViewHelper.php | 9 ++++++---
Resources/Private/Templates/Mail/Index.html | 2 +-
Resources/Private/Templates/Queue/Index.html | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Classes/ViewHelpers/ExtendedIfViewHelper.php b/Classes/ViewHelpers/ExtendedIfViewHelper.php
index e350a832..f36a3c13 100644
--- a/Classes/ViewHelpers/ExtendedIfViewHelper.php
+++ b/Classes/ViewHelpers/ExtendedIfViewHelper.php
@@ -26,6 +26,7 @@ namespace SGalinski\SgMail\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;
/**
@@ -38,9 +39,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/Resources/Private/Templates/Mail/Index.html b/Resources/Private/Templates/Mail/Index.html
index d1210499..b5b5f3f3 100644
--- a/Resources/Private/Templates/Mail/Index.html
+++ b/Resources/Private/Templates/Mail/Index.html
@@ -5,7 +5,7 @@
<f:section name="iconButtons">
</f:section>
<f:section name="content">
- <f:flashMessages renderMode="div" />
+ <f:flashMessages/>
<f:if condition="{noPage}">
<f:then>
<f:if condition="{pages}">
diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index e05f4c73..26936e22 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -6,7 +6,7 @@
</f:section>
<f:section name="content">
- <f:flashMessages renderMode="div" />
+ <f:flashMessages/>
<f:if condition="{queue -> f:count()} > 0">
<f:then>
<div class="panel panel-default recordlist">
--
GitLab