Index: branches/5.0.x/core/kernel/db/cat_tag_processor.php
===================================================================
diff -u -N -r12734 -r12971
--- branches/5.0.x/core/kernel/db/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 12734)
+++ branches/5.0.x/core/kernel/db/cat_tag_processor.php	(.../cat_tag_processor.php)	(revision 12971)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_tag_processor.php 12734 2009-10-20 19:28:11Z alex $
+* @version	$Id: cat_tag_processor.php 12971 2009-12-22 11:18:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -107,10 +107,21 @@
 			$themes_helper =& $this->Application->recallObject('ThemesHelper');
 			/* @var $themes_helper kThemesHelper */
 
+			$site_config_helper =& $this->Application->recallObject('SiteConfigHelper');
+			/* @var $site_config_helper SiteConfigHelper */
+
+			$settings = $site_config_helper->getSettings();
+
+			$params['editing_mode'] = $settings['default_editing_mode'];
 			$params['m_theme'] = $themes_helper->getCurrentThemeId();
-			$params['index_file'] = '../index.php';
+			$params['index_file'] = 'index.php';
+			$params['prefix'] = '_FRONT_END_';
 			$params['admin'] = 1;
 
+			if ($this->Application->ConfigValue('UseModRewrite')) {
+				$params['__MOD_REWRITE__'] = 1;
+			}
+
 			return $this->ItemLink($params);
 		}
 
Index: branches/5.0.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r12953 -r12971
--- branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12953)
+++ branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12971)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 12953 2009-12-20 12:51:32Z alex $
+* @version	$Id: categories_tag_processor.php 12971 2009-12-22 11:18:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1617,14 +1617,24 @@
 		$themes_helper =& $this->Application->recallObject('ThemesHelper');
 		/* @var $themes_helper kThemesHelper */
 
+		$site_config_helper =& $this->Application->recallObject('SiteConfigHelper');
+		/* @var $site_config_helper SiteConfigHelper */
+
+		$settings = $site_config_helper->getSettings();
+
 		$url_params = Array (
 			'm_cat_id' => $object->GetID(),
 			'm_theme' => $themes_helper->getCurrentThemeId(),
+			'editing_mode' => $settings['default_editing_mode'],
 			'pass' => 'm',
 			'admin' => 1,
 			'index_file' => 'index.php'
 		);
 
+		if ($this->Application->ConfigValue('UseModRewrite')) {
+			$url_params['__MOD_REWRITE__'] = 1;
+		}
+
 		return $this->Application->HREF($object->GetDBField('NamedParentPath'), '_FRONT_END_', $url_params);
 	}
 
Index: branches/5.0.x/core/units/helpers/mod_rewrite_helper.php
===================================================================
diff -u -N -r12959 -r12971
--- branches/5.0.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 12959)
+++ branches/5.0.x/core/units/helpers/mod_rewrite_helper.php	(.../mod_rewrite_helper.php)	(revision 12971)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: mod_rewrite_helper.php 12959 2009-12-20 13:05:35Z alex $
+* @version	$Id: mod_rewrite_helper.php 12971 2009-12-22 11:18:48Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -345,7 +345,7 @@
 			}
 
 			// add theme
-			$default_theme_id = $this->Application->GetDefaultThemeId();
+			$default_theme_id = $this->Application->GetDefaultThemeId(true);
 			if ($processed_params['m_theme'] && ($processed_params['m_theme'] != $default_theme_id)) {
 				$theme_name = $this->Application->getCache('theme_names', $processed_params['m_theme']);
 				if ($theme_name === false) {