[MERGE] Merge branch '1.2' into 2.0

neos · Nov 23, 2015 · b7033d2 · b7033d2
2 parents b36c180 + ca8fc4e
commit b7033d2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Classes/TYPO3/TypoScript/Core/ExceptionHandlers/HtmlMessageHandler.php b/Classes/TYPO3/TypoScript/Core/ExceptionHandlers/HtmlMessageHandler.php
@@ -36,7 +36,7 @@ protected function handle($typoScriptPath, \Exception $exception, $referenceCode
     {
         $messageArray = array(
             'header' => 'An exception was thrown while Neos tried to render your page',
-            'content' => $exception->getMessage(),
+            'content' => htmlspecialchars($exception->getMessage()),
             'stacktrace' => $this->formatTypoScriptPath($typoScriptPath),
             'referenceCode' => $this->formatErrorCodeMessage($referenceCode)
         );

diff --git a/Classes/TYPO3/TypoScript/Core/ExceptionHandlers/PlainTextHandler.php b/Classes/TYPO3/TypoScript/Core/ExceptionHandlers/PlainTextHandler.php
@@ -32,14 +32,14 @@ protected function handle($typoScriptPath, \Exception $exception, $referenceCode
             return sprintf(
                 'Exception while rendering %s: %s (%s)',
                 $this->formatScriptPath($typoScriptPath, "\n\t", false),
-                $exception->getMessage(),
+                strip_tags($exception->getMessage()),
                 $referenceCode
             );
         } else {
             return sprintf(
                 'Exception while rendering %s: %s',
                 $this->formatScriptPath($typoScriptPath, "\n\t", false),
-                $exception->getMessage()
+                strip_tags($exception->getMessage())
             );
         }
     }

diff --git a/Classes/TYPO3/TypoScript/Core/ExceptionHandlers/XmlCommentHandler.php b/Classes/TYPO3/TypoScript/Core/ExceptionHandlers/XmlCommentHandler.php
@@ -39,14 +39,14 @@ protected function handle($typoScriptPath, \Exception $exception, $referenceCode
             return sprintf(
                 '<!-- Exception while rendering %s: %s (%s) -->',
                 $this->formatScriptPath($typoScriptPath, ''),
-                $exception->getMessage(),
+                htmlspecialchars($exception->getMessage()),
                 $referenceCode
             );
         } else {
             return sprintf(
                 '<!-- Exception while rendering %s: %s -->',
                 $this->formatScriptPath($typoScriptPath, ''),
-                $exception->getMessage()
+                htmlspecialchars($exception->getMessage())
             );
         }
     }