[TASK] Remove warning if IE6 is used on backend login screen 83/31883/4
authorWouter Wolters <typo3@wouterwolters.nl>
Mon, 28 Jul 2014 13:44:27 +0000 (15:44 +0200)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Tue, 9 Sep 2014 08:37:34 +0000 (10:37 +0200)
When IE6 is used a message is shown that IE6 is not supported.
IE6 support was already dropped since TYPO3 CMS 4.6 so we
now remove this warning.

Resolves: #60640
Releases: 6.3
Change-Id: Ib964fef63fcd987eef4cc04264fff0c7cc761d47
Reviewed-on: http://review.typo3.org/31883
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
Reviewed-by: Andreas Fernandez <andreas.fernandez@aspedia.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/backend/Classes/Controller/LoginController.php
typo3/sysext/backend/Resources/Private/Templates/login.html

index edff1e9..92b64b4 100644 (file)
@@ -322,9 +322,7 @@ class LoginController {
                } else {
                        $logo = '<img' . IconUtility::skinImg($GLOBALS['BACK_PATH'], 'gfx/typo3logo.gif', 'width="123" height="34"') . ' alt="" class="t3-login-logo" />';
                }
-               /** @var $browserWarning \TYPO3\CMS\Core\Messaging\FlashMessage */
-               $browserWarning = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessage', $GLOBALS['LANG']->getLL('warning.incompatibleBrowser') . ' ' . $GLOBALS['LANG']->getLL('warning.incompatibleBrowserInternetExplorer'), $GLOBALS['LANG']->getLL('warning.incompatibleBrowserHeadline'), FlashMessage::ERROR);
-               $browserWarning = $browserWarning->render();
+
                $additionalCssClasses = array();
                if ($this->isLoginInProgress()) {
                        $additionalCssClasses[] = 'error';
@@ -346,7 +344,6 @@ class LoginController {
                        'INFO_ABOUT' => $GLOBALS['LANG']->getLL('info.about', TRUE),
                        'INFO_RELOAD' => $GLOBALS['LANG']->getLL('info.reset', TRUE),
                        'INFO' => $GLOBALS['LANG']->getLL('info.cookies_and_js', TRUE),
-                       'WARNING_BROWSER_INCOMPATIBLE' => $browserWarning,
                        'ERROR_JAVASCRIPT' => $GLOBALS['LANG']->getLL('error.javascript', TRUE),
                        'ERROR_COOKIES' => $GLOBALS['LANG']->getLL('error.cookies', TRUE),
                        'ERROR_COOKIES_IGNORE' => $GLOBALS['LANG']->getLL('error.cookies_ignore', TRUE),
index b43f456..d652be3 100644 (file)
@@ -17,9 +17,6 @@
                                <h2>###ERROR_COOKIES###</h2>
                                <div id="t3-nocookies-ignore"><a href="#" onclick="TYPO3.BackendLogin.hideCookieWarning()">###ERROR_COOKIES_IGNORE###</a></div>
                        </div>
-                       <!--[if lte IE 6]>
-                       ###WARNING_BROWSER_INCOMPATIBLE###
-                       <![endif]-->
                        <div id="t3-login-process" style="display: none">
                                <h2>###LOGIN_PROCESS###</h2>
                        </div>