Revision: 52062
Author: kim
Date: 2009-06-17 18:16:35 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
When doing array_merge, it helps to actually specify multiple arrays ;-)
Modified Paths:
--------------
trunk/testing/installer/LocalSettings.php
Modified: trunk/testing/installer/LocalSettings.php
===================================================================
--- trunk/testing/installer/LocalSettings.php 2009-06-17 18:06:17 UTC (rev
52061)
+++ trunk/testing/installer/LocalSettings.php 2009-06-17 18:16:35 UTC (rev
52062)
@@ -130,7 +130,7 @@
# load Localsettings specific to particular modules
$additional_settings=glob("$IP/LocalSettings/*.php.settings");
-$additional_settings=array_merge(glob("$IP/LocalSettings/*.settings.php"));
#backward compatibility
+$additional_settings=array_merge(glob("$IP/LocalSettings/*.settings.php"),
$additional_settings); #backward compatibility
if ($additional_settings) {
foreach ($additional_settings as $file) {
require_once($file);
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
