D147.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.3.x/core/kernel/utility/system_config.php
	===================================================================
	--- branches/5.3.x/core/kernel/utility/system_config.php
	+++ branches/5.3.x/core/kernel/utility/system_config.php
	@@ -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;
	@@ -280,4 +280,4 @@
	class kSystemConfigException extends Exception
	{

	-}
	\ No newline at end of file
	+}