Index: branches/5.2.x/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r15419 -r15420
--- branches/5.2.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 15419)
+++ branches/5.2.x/core/units/admin/admin_tag_processor.php	(.../admin_tag_processor.php)	(revision 15420)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_tag_processor.php 15419 2012-06-28 10:03:33Z alex $
+* @version	$Id: admin_tag_processor.php 15420 2012-06-28 10:18:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -851,11 +851,11 @@
 
 			$ret = '';
 			$errors = unserialize($errors);
+			$path_regexp = '/^' . preg_quote(FULL_PATH, '/') . '/';
 
 			foreach ($errors as $an_error) {
-				$block_params['file'] = str_replace(FULL_PATH, '', $an_error['file']);
-				$block_params['line'] = $an_error['line'];
-				$block_params['message'] = $an_error['msg'];
+				$block_params = array_merge($block_params, $an_error);
+				$block_params['file'] = preg_replace($path_regexp, '', $an_error['file'], 1);
 
 				$ret .= $this->Application->ParseBlock($block_params);
 			}
@@ -875,6 +875,18 @@
 			return count( unserialize($errors) );
 		}
 
+		/**
+		 * Detects if given exception isn't one caused by tag error
+		 *
+		 * @param Array $params
+		 * @return string
+		 * @access protected
+		 */
+		protected function IsParserException($params)
+		{
+			return mb_strtolower($params['class']) == 'parserexception';
+		}
+
 		function ExportData($params)
 		{
 			$export_helper = $this->Application->recallObject('CSVHelper');