Index: branches/5.2.x/core/kernel/startup.php
===================================================================
diff -u -N -r14609 -r14692
--- branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 14609)
+++ branches/5.2.x/core/kernel/startup.php	(.../startup.php)	(revision 14692)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: startup.php 14609 2011-10-03 13:05:08Z alex $
+* @version	$Id: startup.php 14692 2011-10-25 13:44:32Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -29,21 +29,6 @@
 	$admin_Presets_directory = isset($vars['AdminPresetsDirectory']) ? $vars['AdminPresetsDirectory'] : ADMIN_DIRECTORY;
 	define('ADMIN_PRESETS_DIRECTORY', $admin_Presets_directory);
 
-	# New path detection method: begin
-	if (defined('REL_PATH')) {
-		// location of index.php relatively to site base folder
-		$relative_path = preg_replace('/^[\/]{0,1}admin(.*)/', $admin_directory . '\\1', REL_PATH);
-	}
-	else {
-		// default index.php relative location is administrative console folder
-		define('REL_PATH', $admin_directory);
-		$relative_path = REL_PATH;
-	}
-
-	$ps = rtrim(preg_replace('/' . preg_quote(rtrim($relative_path, '/'), '/') . '$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
-	define('BASE_PATH', $ps);
-	# New path detection method: end
-
 	$https_mark = getArrayValue($_SERVER, 'HTTPS');
 	define('PROTOCOL', ($https_mark == 'on') || ($https_mark == '1') ? 'https://' : 'http://');
 
@@ -73,11 +58,16 @@
 	if (!$vars) {
 		echo 'In-Portal is probably not installed, or configuration file is missing.<br/>';
 		echo 'Please use the installation script to fix the problem.<br/><br/>';
-		echo '<a href="' . PROTOCOL . SERVER_NAME . rtrim(BASE_PATH, '/') . '/core/install.php">Go to installation script</a><br><br>';
+
+		$base_path = rtrim(preg_replace('/'.preg_quote(rtrim($admin_directory, '/'), '/').'$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/');
+		echo '<a href="' . PROTOCOL . SERVER_NAME . $base_path . '/core/install.php">Go to installation script</a><br><br>';
 		flush();
 		exit;
 	}
 
+	// variable WebsitePath is auto-detected once during installation/upgrade
+	define('BASE_PATH', $vars['WebsitePath']);
+
 	define('APPLICATION_CLASS', isset($vars['ApplicationClass']) ? $vars['ApplicationClass'] : 'kApplication');
 	define('APPLICATION_PATH', isset($vars['ApplicationPath']) ? $vars['ApplicationPath'] : '/core/kernel/application.php');