Index: branches/5.0.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r12195 -r12202
--- branches/5.0.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 12195)
+++ branches/5.0.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 12202)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 12195 2009-08-05 09:56:28Z alex $
+* @version	$Id: unit_config_reader.php 12202 2009-08-05 16:52:45Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -56,7 +56,7 @@
 	{
 		parent::Init($prefix,$special);
 
-		$this->_directorySeparator = preg_quote(DIRECTORY_SEPARATOR);
+		$this->_directorySeparator = preg_quote( DIRECTORY_SEPARATOR );
 		$this->_skipFolders[] = trim(WRITEBALE_BASE, '/'); // system folder (where web server can write)
 		$this->_skipFolders[] = array_pop( explode('/', trim(EDITOR_PATH, '/')) ); // last of cmseditor folders
 	}
@@ -257,27 +257,22 @@
 
 		$conn =& $this->Application->GetADODBConnection();
 		if (!isset($this->Application->Memcached) || !($data = $this->Application->Memcached->get('master:config_files'))) {
-			$data = $conn->GetOne('SELECT Data FROM '.TABLE_PREFIX.'Cache WHERE VarName = "config_files"');
+			$data = $conn->GetOne('SELECT Data FROM ' . TABLE_PREFIX . 'Cache WHERE VarName = "config_files"');
 		}
+
 		if ($cache && $data) {
 			$this->configFiles = unserialize($data);
 			shuffle($this->configFiles);
 		}
 		else {
-			$old_kernel_path = FULL_PATH . DIRECTORY_SEPARATOR . 'kernel' . DIRECTORY_SEPARATOR . 'kernel4';
-			if (file_exists($old_kernel_path)) {
-				// when we got both kernel (one from "kernel/kernel4" and other from "core/kernel") version after upgrade
-				die('Please remove "' . $old_kernel_path . '" folder.');
-			}
-
 			$this->findConfigFiles($folderPath); // search from base directory
 		}
 
 		foreach ($this->configFiles as $filename)
 		{
 			$prefix = $this->PreloadConfigFile($filename);
 			if (!$prefix) {
-				trigger_error('Prefix not defined in config file '.$filename, E_USER_ERROR);
+				trigger_error('Prefix not defined in config file ' . $filename, E_USER_ERROR);
 			}
 		}
 	}