X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSiteConfiguration.php;h=8a977fb3893c2a98d7458cec06b80d3403051266;hb=bcb3547848cf27868fa4b9afa2d1b8ffec08c491;hp=469dda89e11def431420d5b3bc7385cec9efe144;hpb=36cb6833e4ebce9feacd1d4ad53e9464d25d177d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index 469dda89e1..8a977fb389 100644
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -1,17 +1,4 @@
 <?php
-
-/**
- * The include paths change after this file is included from commandLine.inc,
- * meaning that require_once() fails to detect that it is including the same
- * file again. We use DIY C-style protection as a workaround.
- */
-
-// Hide this pattern from Doxygen, which spazzes out at it
-/// @cond
-if( !defined( 'SITE_CONFIGURATION' ) ){
-define( 'SITE_CONFIGURATION', 1 );
-/// @endcond
-
 /**
  * This is a class used to hold configuration settings, particularly for multi-wiki sites.
  */
@@ -36,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;
 
@@ -218,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
@@ -321,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.
 	 *
@@ -424,4 +407,3 @@ class SiteConfiguration {
 		}
 	}
 }
-} // End of multiple inclusion guard