diff --git a/Classes/ViewHelpers/AbstractViewHelper.php b/Classes/ViewHelpers/AbstractViewHelper.php
index 448e63e0b14c668edbf9ac0b4d3b6c34ea7b2a96..910e31cdecb29f575884794428d918013f4aa83f 100644
--- a/Classes/ViewHelpers/AbstractViewHelper.php
+++ b/Classes/ViewHelpers/AbstractViewHelper.php
@@ -32,6 +32,17 @@ use TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewHelper;
* Abstract view helper
*/
class AbstractViewHelper extends AbstractBackendViewHelper {
+
+ /**
+ * @var boolean
+ */
+ protected $escapeOutput = FALSE;
+
+ /**
+ * @var boolean
+ */
+ protected $escapeChildren = FALSE;
+
/**
* Returns the base url of the site
*
diff --git a/Classes/ViewHelpers/Backend/ControlViewHelper.php b/Classes/ViewHelpers/Backend/ControlViewHelper.php
index 52e149758402f34e7430f88e60f0b3f32b2b8fca..51334f4c9d0fe8b8e9b6b3be29c91559cade193b 100644
--- a/Classes/ViewHelpers/Backend/ControlViewHelper.php
+++ b/Classes/ViewHelpers/Backend/ControlViewHelper.php
@@ -26,9 +26,9 @@ namespace SGalinski\SgMail\ViewHelpers\Backend;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+use SGalinski\SgMail\ViewHelpers\AbstractViewHelper;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
use TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList;
/**
diff --git a/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php b/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php
index 4df9631d7872628360fbd80a0f7d03940f02774f..9324e396ec4f7a49a99ea2c763f1883cc995ab5d 100644
--- a/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php
+++ b/Classes/ViewHelpers/Backend/EditOnClickViewHelper.php
@@ -26,8 +26,8 @@ namespace SGalinski\SgMail\ViewHelpers\Backend;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+use SGalinski\SgMail\ViewHelpers\AbstractViewHelper;
use TYPO3\CMS\Backend\Utility\BackendUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
* Class EditOnClickViewHelper
diff --git a/Classes/ViewHelpers/Backend/IconViewHelper.php b/Classes/ViewHelpers/Backend/IconViewHelper.php
index 37d0e5d3d96b762ec2e20717ac6a2ea41cfe833b..cfc6c8d181e7b17744a39d7ef4f72e5d1a94a1b5 100644
--- a/Classes/ViewHelpers/Backend/IconViewHelper.php
+++ b/Classes/ViewHelpers/Backend/IconViewHelper.php
@@ -26,11 +26,11 @@ namespace SGalinski\SgMail\ViewHelpers\Backend;
* This copyright notice MUST APPEAR in all copies of the script!
***************************************************************/
+use SGalinski\SgMail\ViewHelpers\AbstractViewHelper;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
/**
* Class IconViewHelper
@@ -54,8 +54,8 @@ class IconViewHelper extends AbstractViewHelper {
. '</span>';
if ($clickMenu) {
return BackendUtility::wrapClickMenuOnIcon($iconImg, $table, $row['uid']);
- } else {
- return $iconImg;
}
+
+ return $iconImg;
}
}
diff --git a/Classes/ViewHelpers/Widget/UriViewHelper.php b/Classes/ViewHelpers/Widget/UriViewHelper.php
index a34f5185bff24c5bb6bdeaa8c5f78446ccd1bb6b..1251b8594ec9ff769a24439c54ee292f3d5177b0 100644
--- a/Classes/ViewHelpers/Widget/UriViewHelper.php
+++ b/Classes/ViewHelpers/Widget/UriViewHelper.php
@@ -33,6 +33,16 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
*/
class UriViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Widget\UriViewHelper {
+ /**
+ * @var boolean
+ */
+ protected $escapeOutput = FALSE;
+
+ /**
+ * @var boolean
+ */
+ protected $escapeChildren = FALSE;
+
/**
* Get the URI for a non-AJAX Request.
*
diff --git a/Resources/Private/Templates/Mail/Index.html b/Resources/Private/Templates/Mail/Index.html
index e2ab0160c502db5d2e71ffeb76adbdcdecd44ca9..2404e8e704754aad37363e629b90455411087ea4 100644
--- a/Resources/Private/Templates/Mail/Index.html
+++ b/Resources/Private/Templates/Mail/Index.html
@@ -158,7 +158,7 @@
<tr data-uid="{page.pid}">
<td nowrap="nowrap" class="col-title">
<a href="#" onclick="sgMailGoToPage({page.uid}, '{page.path}'); return false;">
- <f:format.raw><sgm:backend.icon table="pages" row="{page}" clickMenu="0" /> {page._thePathFull}</f:format.raw>
+ <sgm:backend.icon table="pages" row="{page}" clickMenu="0" /> {page._thePathFull}
</a>
</td>
</tr>
diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index 695c2f5483c3f485fa15b046569f34e41038e75c..e8dd4c830f6b4dc004645ebc11ffd8bb18978056 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -29,12 +29,10 @@
</thead>
<tbody>
<f:for each="{paginatedMails}" as="mail">
- {sgm:backend.editOnClick(table: 'tx_sgmail_domain_model_mail', uid: mail.uid) -> sgm:set(name: 'editOnClick') -> f:format.raw()}
+ {sgm:backend.editOnClick(table: 'tx_sgmail_domain_model_mail', uid: mail.uid) -> sgm:set(name: 'editOnClick')}
<tr data-uid="{mail.uid}">
<td nowrap="nowrap" class="col-icon">
- <f:format.raw>
- <sgm:backend.icon table="tx_sgmail_domain_model_mail" row="{mail}" />
- </f:format.raw>
+ <sgm:backend.icon table="tx_sgmail_domain_model_mail" row="{mail}" />
</td>
<td>
<span>{mail.from_address}</span>
@@ -67,9 +65,7 @@
</f:if>
</td>
<td nowrap="nowrap" class="col-control">
- <f:format.raw>
- <sgm:backend.control table="tx_sgmail_domain_model_mail" row="{mail}" />
- </f:format.raw>
+ <sgm:backend.control table="tx_sgmail_domain_model_mail" row="{mail}" />
</td>
<td>
<f:link.action class="btn btn-default btn-send-now" controller="Queue" action="sendMail" arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
@@ -125,7 +121,7 @@
<tr data-uid="{page.pid}">
<td nowrap="nowrap" class="col-title">
<a href="#" onclick="sgMailGoToPage({page.uid}, '{page.path}'); return false;">
- <f:format.raw><sgm:backend.icon table="pages" row="{page}" clickMenu="0" /> {page._thePathFull}</f:format.raw>
+ <sgm:backend.icon table="pages" row="{page}" clickMenu="0" /> {page._thePathFull}
</a>
</td>
</tr>
diff --git a/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html b/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html
index 8e912b4338dbe8ff97f10e86de4e9956c0012077..ffd7659dd8b57157b7b7e59a2c0536386f89c61d 100644
--- a/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html
+++ b/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html
@@ -72,7 +72,7 @@
<form id="paginator-form-{position}" onsubmit="goToPage{position}(this); return false;" style="display:inline;">
<script type="text/javascript">
function goToPage{position}(formObject) {
- var url = '{sg:widget.uri(arguments:{currentPage: 987654321}) -> f:format.raw()}';
+ var url = '{sg:widget.uri(arguments:{currentPage: 987654321})}';
var page = formObject.elements['paginator-target-page'].value;
if (page > {pagination.numberOfPages}) {
page = {pagination.numberOfPages};