Index: t3lib/class.t3lib_befunc.php
===================================================================
--- t3lib/class.t3lib_befunc.php	(revision 35)
+++ t3lib/class.t3lib_befunc.php	(working copy)
@@ -2608,55 +2608,55 @@
 	 * @return	string
 	 */
 	public static function viewOnClick($id, $backPath = '', $rootLine = '', $anchor = '', $altUrl = '', $addGetVars = '', $switchFocus = TRUE) {
+		
+		$viewScriptPreviewEnabled  = '/' . TYPO3_mainDir . 'mod/user/ws/wsol_preview.php?id=';
+		$viewScriptPreviewDisabled = '/index.php?id=';
+		
 		if ($altUrl) {
-			$url = $altUrl;
-		} else {
+			$viewScriptPreviewEnabled = $viewScriptPreviewDisabled = $altUrl;
+		}
+		
+			// check alternate Domains
+		if ($rootLine)  {
+			$parts = parse_url(t3lib_div::getIndpEnv('TYPO3_SITE_URL'));
+			if (t3lib_BEfunc::getDomainStartPage($parts['host'],$parts['path']))    {
+				$preUrl_temp = t3lib_BEfunc::firstDomainRecord($rootLine);
+			}
+		}
+		$preUrl = $preUrl_temp ? (t3lib_div::getIndpEnv('TYPO3_SSL') ? 'https://' : 'http://').$preUrl_temp : $backPath.'..';
 
-			$viewScriptPreviewEnabled  = '/' . TYPO3_mainDir . 'mod/user/ws/wsol_preview.php?id=';
-			$viewScriptPreviewDisabled = '/index.php?id=';
+			// Look if a fixed preview language should be added:
+		$viewLanguageOrder = $GLOBALS['BE_USER']->getTSConfigVal('options.view.languageOrder');
+		if (strlen($viewLanguageOrder))	{
+			$suffix = '';
 
-				// check alternate Domains
-			if ($rootLine)  {
-				$parts = parse_url(t3lib_div::getIndpEnv('TYPO3_SITE_URL'));
-				if (t3lib_BEfunc::getDomainStartPage($parts['host'],$parts['path']))    {
-					$preUrl_temp = t3lib_BEfunc::firstDomainRecord($rootLine);
-				}
+				// Find allowed languages (if none, all are allowed!)
+			if (!$GLOBALS['BE_USER']->user['admin'] &&
+				strlen($GLOBALS['BE_USER']->groupData['allowed_languages'])) {
+				$allowed_languages = array_flip(explode(',', $GLOBALS['BE_USER']->groupData['allowed_languages']));
 			}
-			$preUrl = $preUrl_temp ? (t3lib_div::getIndpEnv('TYPO3_SSL') ? 'https://' : 'http://').$preUrl_temp : $backPath.'..';
 
-				// Look if a fixed preview language should be added:
-			$viewLanguageOrder = $GLOBALS['BE_USER']->getTSConfigVal('options.view.languageOrder');
-			if (strlen($viewLanguageOrder))	{
-				$suffix = '';
-
-					// Find allowed languages (if none, all are allowed!)
-				if (!$GLOBALS['BE_USER']->user['admin'] &&
-					strlen($GLOBALS['BE_USER']->groupData['allowed_languages'])) {
-					$allowed_languages = array_flip(explode(',', $GLOBALS['BE_USER']->groupData['allowed_languages']));
-				}
-
-					// Traverse the view order, match first occurence:
-				$lOrder = t3lib_div::intExplode(',',$viewLanguageOrder);
-				foreach($lOrder as $langUid)	{
-					if (is_array($allowed_languages) && count($allowed_languages)) {
-						if (isset($allowed_languages[$langUid])) {	// Choose if set.
-							$suffix = '&L='.$langUid;
-							break;
-						}
-					} else {	// All allowed since no lang. are listed.
+				// Traverse the view order, match first occurence:
+			$lOrder = t3lib_div::intExplode(',',$viewLanguageOrder);
+			foreach($lOrder as $langUid)	{
+				if (is_array($allowed_languages) && count($allowed_languages)) {
+					if (isset($allowed_languages[$langUid])) {	// Choose if set.
 						$suffix = '&L='.$langUid;
 						break;
 					}
+				} else {	// All allowed since no lang. are listed.
+					$suffix = '&L='.$langUid;
+					break;
 				}
-
-					// Add it:
-				$addGetVars.= $suffix;
 			}
 
-			$urlPreviewEnabled  = $preUrl . $viewScriptPreviewEnabled . $id . $addGetVars . $anchor;
-			$urlPreviewDisabled = $preUrl . $viewScriptPreviewDisabled . $id . $addGetVars . $anchor;
+				// Add it:
+			$addGetVars.= $suffix;
 		}
 
+		$urlPreviewEnabled  = $preUrl . $viewScriptPreviewEnabled . $id . $addGetVars . $anchor;
+		$urlPreviewDisabled = $preUrl . $viewScriptPreviewDisabled . $id . $addGetVars . $anchor;
+
 		return "previewWin=window.open(top.WorkspaceFrontendPreviewEnabled?'" .
 			$urlPreviewDisabled . "':'" . $urlPreviewEnabled .
 			"','newTYPO3frontendWindow');" . ( $switchFocus ? 'previewWin.focus();' : '');