Index: Classes/Controller/PreviewController.php =================================================================== --- Classes/Controller/PreviewController.php (revision 2842) +++ Classes/Controller/PreviewController.php (working copy) @@ -99,7 +99,8 @@ $wsHelpParams = '&tx_workspaces_web_workspacesworkspaces[controller]=Preview'; $wsHelpUrl = $wsSettingsPath . $wsHelpUri . $wsHelpParams; - $wsBaseUrl = t3lib_div::getIndpEnv('TYPO3_SITE_URL') . 'index.php?id=' . $this->pageId . '&L=' . $language; + $viewDomain = t3lib_BEfunc::getViewDomain($this->pageId); + $wsBaseUrl = $viewDomain . '/index.php?id=' . $this->pageId . '&L=' . $language; // @todo - handle new pages here // branchpoints are not handled anymore because this feature is not supposed anymore