Index: t3lib/class.t3lib_befunc.php =================================================================== --- t3lib/class.t3lib_befunc.php (revision 9863) +++ t3lib/class.t3lib_befunc.php (working copy) @@ -2689,6 +2689,15 @@ $addGetVars .= '&MP=' . $mountPointInfo['MPvar']; } + + // If previewing a page in a workspace, check if the page is a version overlay of an existing page + // If yes, we want to preview the original page and not the overlay (TYPO3 takes care of proper overlaying) + if (t3lib_extMgm::isLoaded('version') && !empty($GLOBALS['BE_USER']->workspace)) { + $record = self::getRecord('pages', $id); + if (!empty($record['t3ver_oid'])) { + $id = $record['t3ver_oid']; + } + } $urlPreviewEnabled = $preUrl . $viewScriptPreviewEnabled . $id . $addGetVars . $anchor; $urlPreviewDisabled = $preUrl . $viewScriptPreviewDisabled . $id . $addGetVars . $anchor;