Index: branches/5.0.x/core/admin_templates/categories/ci_blocks.tpl
===================================================================
diff -u -r12117 -r12570
--- branches/5.0.x/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/categories/ci_blocks.tpl	(.../ci_blocks.tpl)	(revision 12570)
@@ -12,7 +12,7 @@
 	</inp2:m_if>
 
 	<inp2:m_if check="BrowseModeAvailable" pass_params="1">
-		<a href="<inp2:ItemLink template='__default__' index_file='../index.php' admin='1'/>" title="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>">
+		<a href="<inp2:PageBrowseLink template='__default__'/>" title="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>">
 			<img src="<inp2:m_TemplatesBase/>/img/ic_browse_mode.gif" width="8" height="7" alt="<inp2:m_Phrase name='la_alt_Browse' html_escape='1'/>" border="0"/>
 		</a>
 	</inp2:m_if>
Index: branches/5.0.x/core/kernel/db/cat_tag_processor.php
===================================================================
diff -u -r12511 -r12570
--- branches/5.0.x/core/kernel/db/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 12511)
+++ branches/5.0.x/core/kernel/db/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 12570)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_tag_processor.php 12511 2009-09-15 19:27:06Z alex $
+* @version	$Id: cat_tag_processor.php 12570 2009-09-20 13:39:34Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -96,6 +96,24 @@
 			return $this->Application->ProcessParsedTag('m', 't', $params);
 		}
 
+		/**
+		 * Builds link for browsing current item on Front-End
+		 *
+		 * @param Array $params
+		 * @return string
+		 */
+		function PageBrowseLink($params)
+		{
+			$themes_helper =& $this->Application->recallObject('ThemesHelper');
+			/* @var $themes_helper kThemesHelper */
+
+			$params['m_theme'] = $themes_helper->getCurrentThemeId();
+			$params['index_file'] = '../index.php';
+			$params['admin'] = 1;
+
+			return $this->ItemLink($params);
+		}
+
 		function CategoryPath($params)
 		{
 			if ($this->Application->IsAdmin()) {
Index: branches/5.0.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r12565 -r12570
--- branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12565)
+++ branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12570)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 12565 2009-09-18 15:11:47Z dmitrya $
+* @version	$Id: categories_tag_processor.php 12570 2009-09-20 13:39:34Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1822,10 +1822,18 @@
 	{
 		$object =& $this->getObject($params);
 
-		$template = $object->GetDBField('NamedParentPath');
-		$url_params = Array ('admin' => 1, 'pass' => 'm', 'm_cat_id' => $object->GetID(), 'index_file' => 'index.php');
+		$themes_helper =& $this->Application->recallObject('ThemesHelper');
+		/* @var $themes_helper kThemesHelper */
 
-		return $this->Application->HREF($template, '_FRONT_END_', $url_params);
+		$url_params = Array (
+			'm_cat_id' => $object->GetID(),
+			'm_theme' => $themes_helper->getCurrentThemeId(),
+			'pass' => 'm',
+			'admin' => 1,
+			'index_file' => 'index.php'
+		);
+
+		return $this->Application->HREF($object->GetDBField('NamedParentPath'), '_FRONT_END_', $url_params);
 	}
 
 	/**