Index: branches/5.2.x/core/kernel/utility/system_config.php
===================================================================
diff -u -N -r16435 -r16439
--- branches/5.2.x/core/kernel/utility/system_config.php	(.../system_config.php)	(revision 16435)
+++ branches/5.2.x/core/kernel/utility/system_config.php	(.../system_config.php)	(revision 16439)
@@ -149,7 +149,7 @@
 	public function getData()
 	{
 		if ( !$this->data ) {
-			$this->data = array_merge($this->getDefaults(), $this->parse());
+			$this->data = array_replace_recursive($this->getDefaults(), $this->parse());
 		}
 
 		return $this->data;
Index: branches/5.2.x/index.php
===================================================================
diff -u -N -r16438 -r16439
--- branches/5.2.x/index.php	(.../index.php)	(revision 16438)
+++ branches/5.2.x/index.php	(.../index.php)	(revision 16439)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: index.php 16438 2016-11-18 11:08:29Z alex $
+* @version	$Id: index.php 16439 2016-11-18 11:09:56Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL