Index: branches/5.2.x/core/kernel/application.php
===================================================================
diff -u -N -r14665 -r14692
--- branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 14665)
+++ branches/5.2.x/core/kernel/application.php	(.../application.php)	(revision 14692)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 14665 2011-10-15 18:44:34Z alex $
+* @version	$Id: application.php 14692 2011-10-25 13:44:32Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1504,7 +1504,7 @@
 	{
 		if ($ssl === null) {
 			// stay on same encryption level
-			return PROTOCOL . SERVER_NAME . ($add_port && defined('PORT') ? ':' . PORT : '') . rtrim(BASE_PATH, '/') . $prefix . '/';
+			return PROTOCOL . SERVER_NAME . ($add_port && defined('PORT') ? ':' . PORT : '') . BASE_PATH . $prefix . '/';
 		}
 
 		if ($ssl) {
@@ -1526,7 +1526,7 @@
 			$domain = DOMAIN;
 		}
 
-		return 'http://' . $domain . ($add_port && defined('PORT') ? ':' . PORT : '') . rtrim($this->ConfigValue('Site_Path'), '/') . $prefix . '/';
+		return 'http://' . $domain . ($add_port && defined('PORT') ? ':' . PORT : '') . BASE_PATH . $prefix . '/';
 	}
 
 	function Redirect($t = '', $params = Array(), $prefix = '', $index_file = null)