[BUGFIX] Correct escaping behavior of documentation views 36/46536/3
authorClaus Due <claus@namelesscoder.net>
Mon, 8 Feb 2016 18:22:59 +0000 (19:22 +0100)
committerBenni Mack <benni@typo3.org>
Tue, 9 Feb 2016 06:31:59 +0000 (07:31 +0100)
This change updates documentation-related templates and
a single ViewHelper to use the expected escaping toggles.

Change-Id: I0c2e57b3fa253a3d4225f1a383c54236655a0dfa
Releases: master
Resolves: #73181
Reviewed-on: https://review.typo3.org/46536
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
typo3/sysext/cshmanual/Classes/ViewHelpers/FormatViewHelper.php
typo3/sysext/cshmanual/Resources/Private/Partials/Manual.html

index 1ed7551..0749183 100644 (file)
@@ -25,11 +25,18 @@ use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
 class FormatViewHelper extends AbstractViewHelper
 {
     /**
-     * Disable the escaping interceptor
+     * Disable the output escaping interceptor
      *
      * @var bool
      */
-    protected $escapingInterceptorEnabled = false;
+    protected $escapeOutput = false;
+
+    /**
+     * Disable the children escaping interceptor
+     *
+     * @var bool
+     */
+    protected $escapeChildren = false;
 
     /**
      * Format the content
index a752b9a..fa9a502 100644 (file)
@@ -3,7 +3,7 @@
 
 <h2>{manual.headerLine}</h2>
 
-<p>{manual.content}</p>
+<p>{manual.content -> f:format.raw()}</p>
 
 <f:if condition="{manual.configuration.details}">
        <h3>
@@ -16,7 +16,7 @@
        <h3>
                <f:translate key="LLL:EXT:lang/locallang_view_help.xlf:syntax" />
        </h3>
-       {manual.configuration.syntax}
+       {manual.configuration.syntax -> f:format.raw()}
 </f:if>
 
 <f:if condition="{manual.images}">
@@ -28,7 +28,7 @@
                        </f:if>
                </div>
        </f:for>
-       {manual.configuration.syntax}
+       {manual.configuration.syntax -> f:format.raw()}
 </f:if>
 
 <f:if condition="{manual.seeAlso}">
@@ -50,4 +50,4 @@
                        </li>
                </f:for>
        </ul>
-</f:if>
\ No newline at end of file
+</f:if>