| Index: trunk/phase3/includes/SiteConfiguration.php |
| — | — | @@ -23,12 +23,12 @@ |
| 24 | 24 | * Array of domains that are local and can be handled by the same server |
| 25 | 25 | */ |
| 26 | 26 | public $localVHosts = array(); |
| 27 | | - |
| | 27 | + |
| 28 | 28 | /** |
| 29 | 29 | * Optional callback to load full configuration data. |
| 30 | 30 | */ |
| 31 | 31 | public $fullLoadCallback = null; |
| 32 | | - |
| | 32 | + |
| 33 | 33 | /** Whether or not all data has been loaded */ |
| 34 | 34 | public $fullLoadDone = false; |
| 35 | 35 | |
| — | — | @@ -308,7 +308,7 @@ |
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | /** |
| 312 | | - * Merge params beetween the ones passed to the function and the ones given |
| | 312 | + * Merge params between the ones passed to the function and the ones given |
| 313 | 313 | * by self::$siteParamsCallback for backward compatibility |
| 314 | 314 | * Values returned by self::getWikiParams() have the priority. |
| 315 | 315 | * |