diff --git a/typo3/sysext/cshmanual/Classes/ViewHelpers/FormatViewHelper.php b/typo3/sysext/cshmanual/Classes/ViewHelpers/FormatViewHelper.php deleted file mode 100644 index 70170d188e0be0e5c9df0191921179a6046b1535..0000000000000000000000000000000000000000 --- a/typo3/sysext/cshmanual/Classes/ViewHelpers/FormatViewHelper.php +++ /dev/null @@ -1,66 +0,0 @@ -<?php -namespace TYPO3\CMS\Cshmanual\ViewHelpers; - -/* - * This file is part of the TYPO3 CMS project. - * - * It is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License, either version 2 - * of the License, or any later version. - * - * For the full copyright and license information, please read the - * LICENSE.txt file that was distributed with this source code. - * - * The TYPO3 project - inspiring people to share! - */ - -use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper; -use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; -use TYPO3Fluid\Fluid\Core\ViewHelper\Traits\CompileWithContentArgumentAndRenderStatic; - -/** - * Format the given content - * - * @internal - */ -class FormatViewHelper extends AbstractViewHelper -{ - use CompileWithContentArgumentAndRenderStatic; - - /** - * Disable the output escaping interceptor - * - * @var bool - */ - protected $escapeOutput = false; - - /** - * Disable the children escaping interceptor - * - * @var bool - */ - protected $escapeChildren = false; - - /** - * Initializes the arguments - */ - public function initializeArguments() - { - parent::initializeArguments(); - $this->registerArgument('content', 'string', ''); - } - - /** - * Format the content - * - * @param array $arguments - * @param \Closure $renderChildrenClosure - * @param RenderingContextInterface $renderingContext - * - * @return string - */ - public static function renderStatic(array $arguments, \Closure $renderChildrenClosure, RenderingContextInterface $renderingContext) - { - return nl2br(trim(strip_tags($renderChildrenClosure(), '<strong><em><b><i>'))); - } -} diff --git a/typo3/sysext/cshmanual/Resources/Private/Partials/Manual.html b/typo3/sysext/cshmanual/Resources/Private/Partials/Manual.html index 2ab5bef1401a9c27c2dbe5cddb5a6994bfbfc62c..a51305b63e2ce952373905c454ba813f350e32b0 100644 --- a/typo3/sysext/cshmanual/Resources/Private/Partials/Manual.html +++ b/typo3/sysext/cshmanual/Resources/Private/Partials/Manual.html @@ -1,4 +1,3 @@ -{namespace csh=TYPO3\CMS\Cshmanual\ViewHelpers} <a id="{manual.table}{f:if(condition:manual.field,then:'.{manual.field}')}"></a> <h2>{manual.headerLine}</h2> @@ -9,7 +8,7 @@ <h3> <f:translate key="LLL:EXT:lang/Resources/Private/Language/locallang_view_help.xlf:details" /> </h3> - <csh:format>{manual.configuration.details}</csh:format> + {manual.configuration.details -> f:format.stripTags(allowedTags:'<strong><em><b><i>') -> f:format.nl2br()} </f:if> <f:if condition="{manual.configuration.syntax}">