[TASK] Remove obsolete IE6 condition in debug exception handler 15/54515/3
authorBenni Mack <benni@typo3.org>
Tue, 31 Oct 2017 20:40:55 +0000 (21:40 +0100)
committerChristian Kuhn <lolli@schwarzbu.ch>
Wed, 1 Nov 2017 10:56:34 +0000 (11:56 +0100)
Some very lonesome IE6 check can be removed for
debugging purposes now, since IE6 support has been dropped
for a long time, and for debugging purposes especially this
use-case does not exist anymore.

Resolves: #82891
Releases: master
Change-Id: I166d5becea3b1c6a53e1a1e50dcb1731332229e6
Reviewed-on: https://review.typo3.org/54515
Reviewed-by: Riccardo De Contardi <erredeco@gmail.com>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Alexander Opitz <opitz.alexander@googlemail.com>
Tested-by: Alexander Opitz <opitz.alexander@googlemail.com>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
typo3/sysext/core/Classes/Error/DebugExceptionHandler.php

index 90a5f08..1e74c94 100644 (file)
@@ -46,24 +46,11 @@ class DebugExceptionHandler extends AbstractExceptionHandler
             : '';
         $backtraceCode = $this->getBacktraceCode($exception->getTrace());
         $this->writeLogEntries($exception, self::CONTEXT_WEB);
-        // Set the XML prologue
-        $xmlPrologue = '<?xml version="1.0" encoding="utf-8"?>';
-        // Set the doctype declaration
-        $docType = '<!DOCTYPE html
+        echo '<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">';
-        // Get the browser info
-        $browserInfo = \TYPO3\CMS\Core\Utility\ClientUtility::getBrowserInfo(
-            \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('HTTP_USER_AGENT')
-        );
-        // Put the XML prologue before or after the doctype declaration according to browser
-        if ($browserInfo['browser'] === 'msie' && $browserInfo['version'] < 7) {
-            $headerStart = $docType . LF . $xmlPrologue;
-        } else {
-            $headerStart = $xmlPrologue . LF . $docType;
-        }
-        echo $headerStart . '
-                       <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+        <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
                                <head>
                                        <title>TYPO3 Exception</title>
                                        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />