Refs #1713

 * keep sections that don't exist inglobal.ini.php (prevent NOTICE). 
 * save sections in order that they appear in global.ini.php

git-svn-id: http://dev.piwik.org/svn/trunk@6000 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 13 insertions, 2 deletions

diff --git a/core/Config.php b/core/Config.php
index 4c544b5305..5a672f08b5 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -381,9 +381,20 @@ class Piwik_Config
 				}
 			}
 
-			foreach($configCache as $name => $section)
+			foreach($configGlobal as $name => $section)
 			{
-				$configLocal = $this->array_unmerge($configGlobal[$name], $configCache[$name]);
+				if(!isset($configCache[$name]))
+				{
+					continue;
+				}
+				
+				$configLocal = $configCache[$name];
+				// Only merge if the section exists in Global.ini.php (in case a section only lives in config.ini.php) 
+				if(isset($configGlobal[$name]))
+				{
+					$configLocal = $this->array_unmerge($configGlobal[$name], $configCache[$name]);
+				}
+				
 				if (count($configLocal) == 0)
 				{
 					continue;