Index: branches/unlabeled/unlabeled-1.26.8/core/kernel/parser/template_parser.php
===================================================================
diff -u -r6437 -r6826
--- branches/unlabeled/unlabeled-1.26.8/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 6437)
+++ branches/unlabeled/unlabeled-1.26.8/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 6826)
@@ -393,6 +393,7 @@
 				$this->SetParams($params, 0); // 0 to disable params sorting and regexp generation - not needed when processing pre-parsed
 				ob_start();
 				if ($pre_parsed['mode'] == 'file') {
+					$this->TemplateName = str_replace(FULL_PATH, '', realpath($pre_parsed['fname']));
 					include($pre_parsed['fname']);
 				}
 				else {
@@ -412,7 +413,9 @@
 
 				$this->CompiledBuffer .= '$o = \'\';'."\n";
 
-				$output = $this->NewParse($this->Application->TemplatesCache->GetTemplateBody($name, $silent), $name);
+				$body = $this->Application->TemplatesCache->GetTemplateBody($name, $silent);
+				$this->TemplateName = $name;
+				$output = $this->NewParse($body, $name);
 
 				$this->CompiledBuffer .= '?'.'>'."\n";