Index: typo3/sysext/cms/tslib/class.tslib_fe.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_fe.php	(revision 8773)
+++ typo3/sysext/cms/tslib/class.tslib_fe.php	(working copy)
@@ -4365,7 +4365,7 @@
 	function whichWorkspace($returnTitle = FALSE)	{
 		if ($this->doWorkspacePreview())	{
 			$ws = intval($this->workspacePreview);
-		} elseif ($this->beUserLogin) {
+		} elseif ($GLOBALS['BE_USER'] && $GLOBALS['BE_USER']->workspace) {
 			$ws = $GLOBALS['BE_USER']->workspace;
 		} else return FALSE;