Index: trunk/core/kernel/parser/tags.php
===================================================================
diff -u -N -r8901 -r8903
--- trunk/core/kernel/parser/tags.php	(.../tags.php)	(revision 8901)
+++ trunk/core/kernel/parser/tags.php	(.../tags.php)	(revision 8903)
@@ -24,6 +24,7 @@
 			if ($tag_data != '') $this->_Tag->ParseTagData($tag_data);
 			$this->_Tag->NP =& $this->_Tag->NamedParams;
 		}
+		$this->_Tag->TemplateName = $parser->TemplateName;
 		return $this->_Tag;
 	}
 
@@ -35,6 +36,7 @@
 	var $Params = Array();
 	var $NamedParams = Array();
 	var $NP;
+	var $TemplateName;
 	/**
 	 * Enter description here...
 	 *
@@ -60,6 +62,7 @@
 		$this->Params = $tag->Params;
 		$this->NamedParams = $tag->NamedParams;
 		$this->Parser =& $tag->Parser;
+		$this->TemplateName = $tag->TemplateName;
 	}
 
 	function GetFullTag()