Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Setup: Move mbstring.func_overload from WebStart to Setup"

Browse source
This commit is contained in:
jenkins-bot 2018-04-18 16:22:16 +00:00 committed by Gerrit Code Review
commit 37d9285d78
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/Setup.php
View file

@ -37,6 +37,11 @@ if ( !defined( 'MEDIAWIKI' ) ) {
* Pre-config setup: Before loading LocalSettings.php * 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 // Start the autoloader, so that extensions can derive classes from core files
require_once "$IP/includes/AutoLoader.php"; require_once "$IP/includes/AutoLoader.php";

4
includes/WebStart.php
View file

@ -25,10 +25,6 @@
* @file * @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 # 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 # We're adding it here so that it's *always* set, even for alternate entry
# points and when $wgOut gets disabled or overridden. # points and when $wgOut gets disabled or overridden.