X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FWebStart.php;h=c83fdea5115b73249da15fec30d5dafcecaecf06;hb=a891b8643c35ffacfda59d9208778195c39c3d9b;hp=b24ff7a8aa37fc7505595aea3cd26ffc159652a3;hpb=28f07c0a7f6a16adfcc65cdab64eeeab6aba07b1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebStart.php b/includes/WebStart.php
index b24ff7a8aa..c83fdea511 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -25,10 +25,6 @@
  * @file
  */
 
-if ( ini_get( 'mbstring.func_overload' ) ) {
-	die( 'MediaWiki does not support installations where mbstring.func_overload is non-zero.' );
-}
-
 # T17461: Make IE8 turn off content sniffing. Everybody else should ignore this
 # We're adding it here so that it's *always* set, even for alternate entry
 # points and when $wgOut gets disabled or overridden.
@@ -54,6 +50,7 @@ if ( !defined( 'MW_CONFIG_CALLBACK' ) ) {
 		define( 'MW_CONFIG_FILE', "$IP/LocalSettings.php" );
 	}
 	if ( !is_readable( MW_CONFIG_FILE ) ) {
+
 		function wfWebStartNoLocalSettings() {
 			# 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
@@ -62,12 +59,14 @@ if ( !defined( 'MW_CONFIG_CALLBACK' ) ) {
 			require_once "$IP/includes/NoLocalSettings.php";
 			die();
 		}
+
 		define( 'MW_CONFIG_CALLBACK', 'wfWebStartNoLocalSettings' );
 	}
 }
 
 // Custom setup for WebStart entry point
 if ( !defined( 'MW_SETUP_CALLBACK' ) ) {
+
 	function wfWebStartSetup() {
 		// Initialise output buffering
 		// Check for previously set up buffers, to avoid a mix of gzip and non-gzip output.
@@ -75,6 +74,7 @@ if ( !defined( 'MW_SETUP_CALLBACK' ) ) {
 			ob_start( 'MediaWiki\\OutputHandler::handle' );
 		}
 	}
+
 	define( 'MW_SETUP_CALLBACK', 'wfWebStartSetup' );
 }