Bug #79568 » RTE 79568 7.6 6.2.patch

Patch for 7.6 and 6.2 - Pierrick Caillon, 2017-01-31 14:23

View differences:

html/typo3/sysext/feedit/Classes/FrontendEditPanel.php (revision )
304 304
     */
305 305
    protected function editPanelLinkWrap_doWrap($string, $url, $additionalClasses = '')
306 306
    {
307
        $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=' . ExtensionManagementUtility::extRelPath('backend') . 'Resources/Private/Templates/Close.html') . ',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
307
        $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=' . rawurlencode(ExtensionManagementUtility::extRelPath('backend') . 'Resources/Private/Templates/Close.html')) . ',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
308 308
        return '<a href="#" class="btn btn-default btn-sm ' . htmlspecialchars($additionalClasses) . '" onclick="' . htmlspecialchars($onclick) . '" class="frontEndEditIconLinks">' . $string . '</a>';
309 309
    }
310 310

  
html/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Configuration/Config.js (revision )
57 57
				this.baseURL = document.URL;
58 58
			}
59 59
		}
60
		if (this.baseURL && this.baseURL.match(/(.*\:\/\/.*\/)[^\/]*/)) {
60
		if (this.baseURL && this.baseURL.match(/(.*\:\/\/[^?#]*\/)[^\/]*/)) {
61 61
			this.baseURL = RegExp.$1;
62 62
		}
63 63
			// URL-s
(3-3/3)