Index: branches/5.2.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r14628 -r14699
--- branches/5.2.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 14628)
+++ branches/5.2.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 14699)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 14628 2011-10-04 09:36:30Z alex $
+* @version	$Id: unit_config_reader.php 14699 2011-10-26 11:39:38Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -816,10 +816,14 @@
 
 				return $prefix;
 			}
-			elseif ($prefix = array_search($filename, $this->prefixFiles)) {
-				// attempt is made to include config file twice or more, but include_once prevents that,
-				// but file exists on hdd, then it is already saved to all required arrays, just return it's prefix
-				return $prefix;
+			else {
+				$prefix = array_search($filename, $this->prefixFiles);
+
+				if ( $prefix ) {
+					// attempt is made to include config file twice or more, but include_once prevents that,
+					// but file exists on hdd, then it is already saved to all required arrays, just return it's prefix
+					return $prefix;
+				}
 			}
 		}
 
@@ -924,19 +928,20 @@
 	 */
 	function setUnitOption($prefix, $name, $value)
 	{
-		if (preg_match('/(.*)\.(.*)/', $prefix, $rets)) {
-			if (!isset($this->configData[$rets[1]])) {
+		if ( preg_match('/(.*)\.(.*)/', $prefix, $rets) ) {
+			if ( !isset($this->configData[$rets[1]]) ) {
 				$this->loadConfig($rets[1]);
 			}
+
 			$this->configData[$rets[1]][$name][$rets[2]] = $value;
 		}
 		else {
-			if (!isset($this->configData[$prefix])) {
+			if ( !isset($this->configData[$prefix]) ) {
 				$this->loadConfig($prefix);
 			}
+
 			$this->configData[$prefix][$name] = $value;
 		}
-
 	}
 
 	protected function getClasses($prefix)