--- C:/Users/Martin/SVN/nak.org/cms45/typo3_src-4.5.3/typo3/sysext/cms/tslib/class.tslib_menu.php.old	Do  1. Jan 10:13:08 1970
+++ C:/Users/Martin/SVN/nak.org/cms45/typo3_src-4.5.3/typo3/sysext/cms/tslib/class.tslib_menu.php	Mi  8. Jun 14:47:55 2011
@@ -2009,7 +2009,8 @@
 		$part = isset($this->I['val']['wrapItemAndSub.'])
 			? $this->WMcObj->stdWrap($this->I['val']['wrapItemAndSub'], $this->I['val']['wrapItemAndSub.'])
 			: $this->I['val']['wrapItemAndSub'];
-		$this->WMresult.= $part ? $this->tmpl->wrap($this->I['theItem'],$part) : $this->I['theItem'];
+		if ($this->I['val']['subst_elementUid'])   $part = str_replace('{elementUid}',$this->I['uid'],$part);
+		$this->WMresult .= $part ? $this->tmpl->wrap($this->I['theItem'], $part) : $this->I['theItem'];
 	}
 
 	/**
@@ -2555,7 +2556,8 @@
 		$part = isset($this->I['val']['wrapItemAndSub.'])
 			? $this->WMcObj->stdWrap($this->I['val']['wrapItemAndSub'], $this->I['val']['wrapItemAndSub.'])
 			: $this->I['val']['wrapItemAndSub'];
-		$this->WMresult.= $part ? $this->tmpl->wrap($this->I['theItem'],$part) : $this->I['theItem'];
+		if ($this->I['val']['subst_elementUid'])   $part = str_replace('{elementUid}',$this->I['uid'],$part);
+		$this->WMresult .= $part ? $this->tmpl->wrap($this->I['theItem'],$part) : $this->I['theItem'];
 	}