diff --git a/core/Config/IniFileChain.php b/core/Config/IniFileChain.php index 571863770fc51114af78202cbdd7b608f883827c..9eaae3e9ff5557edc3f8562be4bd62465e612f59 100644 --- a/core/Config/IniFileChain.php +++ b/core/Config/IniFileChain.php @@ -20,9 +20,10 @@ use Piwik\Piwik; * user settings file. * * The default setting files (for example, global.ini.php & common.ini.php) hold the default setting values. - * The settings in these files are merged recursively, so array settings in one file will add elements to - * the same settings in the previous file. Default settings files cannot be modified through the IniFileChain - * class. + * The settings in these files are merged recursively, however, array settings in one file will still + * overwrite settings in the previous file. + * + * Default settings files cannot be modified through the IniFileChain class. * * The user settings file (for example, config.ini.php) holds the actual setting values. Settings in the * user settings files overwrite other settings. So array settings will not merge w/ previous values. diff --git a/tests/PHPUnit/Unit/Config/IniFileChainTest.php b/tests/PHPUnit/Unit/Config/IniFileChainTest.php index 7c83f499c1f1907051a066dee3f279706c50574d..0d8d359cd01899a18f82a0722dc4f398f7279ca5 100644 --- a/tests/PHPUnit/Unit/Config/IniFileChainTest.php +++ b/tests/PHPUnit/Unit/Config/IniFileChainTest.php @@ -136,8 +136,6 @@ class IniFileChainTest extends PHPUnit_Framework_TestCase 'Section1' => array( 'var1' => 'overriddenValue1', 'var3' => array( - 'value3', - 'value4', 'overriddenValue2', 'overriddenValue3' )