summaryrefslogtreecommitdiff
path: root/includes/SiteConfiguration.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/SiteConfiguration.php')
-rw-r--r--includes/SiteConfiguration.php10
1 files changed, 3 insertions, 7 deletions
diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index ebdb08fe..8a977fb3 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -23,12 +23,12 @@ class SiteConfiguration {
* Array of domains that are local and can be handled by the same server
*/
public $localVHosts = array();
-
+
/**
* Optional callback to load full configuration data.
*/
public $fullLoadCallback = null;
-
+
/** Whether or not all data has been loaded */
public $fullLoadDone = false;
@@ -205,10 +205,6 @@ class SiteConfiguration {
return $this->wikis;
}
- /** A no-op */
- function initialise() {
- }
-
/**
* Retrieves the value of a given setting, and places it in a variable passed by reference.
* @param $setting String ID of the setting name to retrieve
@@ -308,7 +304,7 @@ class SiteConfiguration {
}
/**
- * Merge params beetween the ones passed to the function and the ones given
+ * Merge params between the ones passed to the function and the ones given
* by self::$siteParamsCallback for backward compatibility
* Values returned by self::getWikiParams() have the priority.
*