[BUGFIX] Make other framesets in BE work again 59/33959/3
authorBenjamin Mack <benni@typo3.org>
Mon, 10 Nov 2014 17:57:17 +0000 (18:57 +0100)
committerFrank Nägler <typo3@naegler.net>
Tue, 11 Nov 2014 22:31:36 +0000 (23:31 +0100)
Similar to ElementBrowser, the other
parts where <frameset> is used don't
work right now. This needs to be fixed.

Resolves: #62834
Related: #62825
Releases: master
Change-Id: Ic7e39bd4e4eb7f8326e4f16b379330aa95081eed
Reviewed-on: http://review.typo3.org/33959
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Frank Nägler <typo3@naegler.net>
Tested-by: Frank Nägler <typo3@naegler.net>
typo3/sysext/backend/Classes/Controller/LoginFramesetController.php
typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php

index c5eba45..65d933e 100644 (file)
@@ -28,24 +28,21 @@ class LoginFramesetController {
 
        /**
         * Main function.
-        * Creates the header code in XHTML, then the frameset for the two frames.
+        * Creates the header code and the frameset for the two frames.
         *
         * @return void
         */
        public function main() {
-               // Set doktype:
-               $GLOBALS['TBE_TEMPLATE']->docType = 'xhtml_frames';
                $title = 'TYPO3 Re-Login (' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . ')';
-               $this->content .= $GLOBALS['TBE_TEMPLATE']->startPage($title);
-               // Create the frameset for the window:
-               $this->content .= '
+               $GLOBALS['TBE_TEMPLATE']->startPage($title);
+
+               // Create the frameset for the window
+               $this->content = $GLOBALS['TBE_TEMPLATE']->getPageRenderer()->render(\TYPO3\CMS\Core\Page\PageRenderer::PART_HEADER) . '
                        <frameset rows="*,1">
                                <frame name="login" src="index.php?loginRefresh=1" marginwidth="0" marginheight="0" scrolling="no" noresize="noresize" />
                                <frame name="dummy" src="dummy.php" marginwidth="0" marginheight="0" scrolling="auto" noresize="noresize" />
                        </frameset>
-               ';
-               $this->content .= '
-</html>';
+               </html>';
        }
 
        /**
index ab456d2..b22f9df 100644 (file)
@@ -259,15 +259,14 @@ class ColorpickerController {
         * @return void
         */
        public function frameSet() {
-               // Set doktype:
-               $GLOBALS['TBE_TEMPLATE']->docType = 'xhtml_frames';
                $GLOBALS['TBE_TEMPLATE']->JScode = $GLOBALS['TBE_TEMPLATE']->wrapScriptTags('
                                if (!window.opener) {
                                        alert("ERROR: Sorry, no link to main window... Closing");
                                        close();
                                }
                ');
-               $this->content = $GLOBALS['TBE_TEMPLATE']->startPage($GLOBALS['LANG']->getLL('colorpicker_title'));
+               $GLOBALS['TBE_TEMPLATE']->startPage($GLOBALS['LANG']->getLL('colorpicker_title'));
+
                // URL for the inner main frame:
                $url = BackendUtility::getModuleUrl(
                        'wizard_colorpicker',
@@ -282,14 +281,12 @@ class ColorpickerController {
                                'fieldChangeFuncHash' => $this->P['fieldChangeFuncHash'],
                        )
                );
-               $this->content .= '
+               $this->content = $GLOBALS['TBE_TEMPLATE']->getPageRenderer()->render(\TYPO3\CMS\Core\Page\PageRenderer::PART_HEADER) . '
                        <frameset rows="*,1" framespacing="0" frameborder="0" border="0">
                                <frame name="content" src="' . htmlspecialchars($url) . '" marginwidth="0" marginheight="0" frameborder="0" scrolling="auto" noresize="noresize" />
                                <frame name="menu" src="dummy.php" marginwidth="0" marginheight="0" frameborder="0" scrolling="no" noresize="noresize" />
                        </frameset>
-               ';
-               $this->content .= '
-</html>';
+               </html>';
        }
 
        /************************************