X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebStart.php;h=766b3bf53421b921d35dfe39b5f9e8143544f441;hb=9b840c281cfae3c060941e45933e7798647064be;hp=604a3c04ce3d3c2e48aeaec3ed3cf05b51a6369b;hpb=9507d3ad7b3f5ffd864fd32412de77b04e5a94da;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebStart.php b/includes/WebStart.php
index 604a3c04ce..766b3bf534 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -1,10 +1,13 @@
 <?php
 /**
- * This does the initial setup for a web request.
+ * This does the initial set up for a web request.
  * It does some security checks, starts the profiler and loads the
  * configuration, and optionally loads Setup.php depending on whether
  * MW_NO_SETUP is defined.
  *
+ * Setup.php (if loaded) then sets up GlobalFunctions, the AutoLoader,
+ * and the configuration globals (though not $wgTitle).
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -91,9 +94,6 @@ if ( $IP === false ) {
 	}
 }
 
-# Get MWInit class
-require_once "$IP/includes/Init.php";
-
 # Start the autoloader, so that extensions can derive classes from core files
 require_once "$IP/includes/AutoLoader.php";
 
@@ -121,7 +121,7 @@ if ( is_readable( "$IP/vendor/autoload.php" ) ) {
 
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
 	# Use a callback function to configure MediaWiki
-	MWFunction::call( MW_CONFIG_CALLBACK );
+	call_user_func( MW_CONFIG_CALLBACK );
 } else {
 	if ( !defined( 'MW_CONFIG_FILE' ) ) {
 		define( 'MW_CONFIG_FILE', "$IP/LocalSettings.php" );
@@ -129,8 +129,8 @@ if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
 
 	# LocalSettings.php is the per site customization file. If it does not exist
 	# the wiki installer needs to be launched or the generated file uploaded to
-	# the root wiki directory
-	if ( !file_exists( MW_CONFIG_FILE ) ) {
+	# the root wiki directory. Give a hint, if it is not readable by the server.
+	if ( !is_readable( MW_CONFIG_FILE ) ) {
 		require_once "$IP/includes/templates/NoLocalSettings.php";
 		die();
 	}