| Index: trunk/testing/installer/LocalSettings.php |
| — | — | @@ -130,7 +130,7 @@ |
| 131 | 131 | # load Localsettings specific to particular modules |
| 132 | 132 | |
| 133 | 133 | $additional_settings=glob("$IP/LocalSettings/*.php.settings"); |
| 134 | | -$additional_settings=array_merge(glob("$IP/LocalSettings/*.settings.php")); #backward compatibility |
| | 134 | +$additional_settings=array_merge(glob("$IP/LocalSettings/*.settings.php"), $additional_settings); #backward compatibility |
| 135 | 135 | if ($additional_settings) { |
| 136 | 136 | foreach ($additional_settings as $file) { |
| 137 | 137 | require_once($file); |