2010-07-27 Steffen Kamper <steffen@typo3.org>
+ * Fixed bug #14946: Switching workplaces causes nesting of BE (Thanks to Stefan Galinski)
* Fixed bug #13649: Deprecated function sql_regcase in cms/tslib/class.tslib_pagegen.php (Thanks to Martin Müller)
2010-07-27 Susanne Moog <typo3@susanne-moog.de>
// If another page module was specified, replace the default Page module with the new one
$newPageModule = trim($GLOBALS['BE_USER']->getTSConfigVal('options.overridePageModule'));
$pageModule = t3lib_BEfunc::isModuleSetInTBE_MODULES($newPageModule) ? $newPageModule : 'web_layout';
+ if (!$GLOBALS['BE_USER']->check('modules', $pageModule)) {
+ $pageModule = '';
+ }
$menuFrameName = 'menu';
if($GLOBALS['BE_USER']->uc['noMenuMode'] === 'icons') {
if (top.content && top.content.nav_frame && top.content.nav_frame.refresh_nav) {
top.content.nav_frame.refresh_nav();
}
-
- top.goToModule(TYPO3.configuration.pageModule, 0, addGetVars?addGetVars:"");
+ if (TYPO3.configuration.pageModule) {
+ top.goToModule(TYPO3.configuration.pageModule, 0, addGetVars?addGetVars:"");
+ }
}
/**
// the boolean "true" makes the page reload from the server
$('content').contentWindow.location.reload(true);
} else {
- top.goToModule('web_layout');
+ if (TYPO3.configuration.pageModule) {
+ top.goToModule(TYPO3.configuration.pageModule);
+ }
}
// reload the module menu