Index: branches/5.2.x/core/units/categories/categories_event_handler.php
===================================================================
diff -u -N -r15354 -r15361
--- branches/5.2.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 15354)
+++ branches/5.2.x/core/units/categories/categories_event_handler.php	(.../categories_event_handler.php)	(revision 15361)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_event_handler.php 15354 2012-05-18 10:19:38Z alex $
+* @version	$Id: categories_event_handler.php 15361 2012-05-29 09:04:14Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2814,12 +2814,18 @@
 				$template = 'index';
 			}
 
-			// remove template from url if it is category index cached template OR site homepage
-			if (($template == $category_template) || (mb_strtolower($template) == '__default__') || ($template == 'index')) {
-				// given template is also default template for this category OR '__default__' given OR site homepage
+			// remove template from url if it is category index cached template
+			if ( ($template == $category_template) || (mb_strtolower($template) == '__default__') ) {
+				// given template is also default template for this category OR '__default__' given
 				$params['pass_template'] = false;
 			}
 
+			// remove template from url if it is site homepage on primary language & theme
+			if ( ($template == 'index') && $processed_params['m_lang'] == $rewrite_processor->primaryLanguageId && $processed_params['m_theme'] == $rewrite_processor->primaryThemeId ) {
+				// given template is site homepage on primary language & theme
+				$params['pass_template'] = false;
+			}
+
 			if ($template && $params['pass_template']) {
 				$ret .= $template . '/';
 			}