From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 17 Apr 2018 22:07:48 +0000 (+0100)
Subject: Setup: Move mbstring.func_overload from WebStart to Setup
X-Git-Tag: 1.34.0-rc.0~5695^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=5c94aed0c3ab1f8ee76d37cb4854f80272fc38d7;p=lhc%2Fweb%2Fwiklou.git

Setup: Move mbstring.func_overload from WebStart to Setup

Follows-up 26c2d03c17, 41d1fa1c3a and r11547 (c7f363f886).

Also add references to the relevant tasks about why the check
exists.

Bug: T189966
Change-Id: Ic1f0c79a1b5638bb30351a0cab55699931d1fded
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 6513cdd4b3..de7d59a580 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -37,6 +37,11 @@ if ( !defined( 'MEDIAWIKI' ) ) {
  * Pre-config setup: Before loading LocalSettings.php
  */
 
+// Sanity check (T5782, T122807)
+if ( ini_get( 'mbstring.func_overload' ) ) {
+	die( 'MediaWiki does not support installations where mbstring.func_overload is non-zero.' );
+}
+
 // Start the autoloader, so that extensions can derive classes from core files
 require_once "$IP/includes/AutoLoader.php";
 
diff --git a/includes/WebStart.php b/includes/WebStart.php
index 6f3aa71624..d64aae0024 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.