Simpler structure for wgLocalDatabases, for faster setup. SiteConfiguration::getAll...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f0142eb..7a38a50 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -512,7 +512,7 @@ $wgDBmysql5                 = false;
 /**
  * Other wikis on this site, can be administered from a single developer
  * account.
- * Array, interwiki prefix => database name
+ * Array numeric key => database name
  */
 $wgLocalDatabases   = array();
 

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 89cf746..6cb645b 100644 (file)
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -18,7 +18,6 @@ class SiteConfiguration {
        var $suffixes = array();
        var $wikis = array();
        var $settings = array();
-       var $localDatabases = array();
        var $localVHosts = array();
 
        /** */  
@@ -45,6 +44,18 @@ class SiteConfiguration {
                return $retval;
        }
 
+       /** */
+       function getAll( $wiki, $suffix, $params ) {
+               $localSettings = array();
+               foreach ( $this->settings as $varname => $stuff ) {
+                       $value = $this->get( $varname, $wiki, $suffix, $params );
+                       if ( !is_null( $value ) ) { 
+                               $localSettings[$varname] = $value;
+                       }
+               }
+               return $localSettings;
+       }
+
        /** */
        function getBool( $setting, $wiki, $suffix ) {
                return (bool)($this->get( $setting, $wiki, $suffix ));
@@ -52,14 +63,11 @@ class SiteConfiguration {
 
        /** */
        function &getLocalDatabases() {
-               return $this->localDatabases;
+               return $this->wikis;
        }
 
        /** */
        function initialise() {
-               foreach ( $this->wikis as $db ) {
-                       $this->localDatabases[$db] = $db;
-               }
        }
 
        /** */