diff -x CVS -Nr --unified=5 typo3_src-3.8.1_untouched/t3lib/class.t3lib_tstemplate.php typo3_src-3.8.1/t3lib/class.t3lib_tstemplate.php
--- typo3_src-3.8.1_untouched/t3lib/class.t3lib_tstemplate.php	2005-11-12 12:40:19.000000000 +0100
+++ typo3_src-3.8.1/t3lib/class.t3lib_tstemplate.php	2006-03-24 17:38:22.000000000 +0100
@@ -1278,10 +1278,19 @@
 	function linkData($page,$oTarget,$no_cache,$script,$overrideArray='',$addParams='',$typeOverride='')	{
 		global $TYPO3_CONF_VARS;
 
 		$LD = Array();
 
+			// Shortcut:		
+		if ($page['doktype']==4) {
+			$tmp_page = $GLOBALS['TSFE']->getPageShortcut($page['shortcut'],$page['shortcut_mode'],$thisUid = $page['uid']);
+			if ($tmp_page) { // function getPageShortcut can break if too many shortcut->shortcut. if so fallback to old method
+					$page = $tmp_page;
+			}
+			unset($tmp_page);
+		}
+
 			// Overriding some fields in the page record and still preserves the values by adding them as parameters. Little strange function.
 		if (is_array($overrideArray))	{
 			foreach($overrideArray as $theKey => $theNewVal)	{
 				$addParams.= '&real_'.$theKey.'='.rawurlencode($page[$theKey]);
 				$page[$theKey] = $theNewVal;