Index: branches/5.1.x/core/kernel/application.php
===================================================================
diff -u -r13394 -r13454
--- branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13394)
+++ branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 13454)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 13394 2010-04-25 12:04:59Z alex $
+* @version	$Id: application.php 13454 2010-04-28 11:29:44Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1833,13 +1833,12 @@
 			// remove tempporary parameters used by listeners
 			unset($params['t'], $params['inject_parts'], $params['pass_template'], $params['pass_category'], $params['category_processed']);
 
-			if ($catalog_item_found || !$cat_processed || !defined('EXP_DIR_URLS')) {
-				// this catalog item detail page OR there is no category given
-				$ret = trim($ret, '/') . '.html';
+			if (array_key_exists('url_ending', $params)) {
+				$ret = trim($ret, '/') . $params['url_ending'];
+				unset($params['url_ending']);
 			}
 			else {
-				// url ends with "/" and not with ".html"
-				$ret = trim($ret, '/') .  '/';
+				$ret = trim($ret, '/') . MOD_REWRITE_URL_ENDING;
 			}
 
 			if ($env) {