From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 28 Jul 2011 07:27:40 +0000 (+0000)
Subject: Fixed typo. w/s cleanup.
X-Git-Tag: 1.31.0-rc.0~28569
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=19d66a666855ab75e2134f7a441a78bc5a8bd0c1;p=lhc%2Fweb%2Fwiklou.git

Fixed typo. w/s cleanup.
---

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index ebdb08fe02..556227a671 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;
 
@@ -308,7 +308,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.
 	 *