From: Max Semenik <maxsem.wiki@gmail.com>
Date: Mon, 13 Jun 2016 21:28:28 +0000 (-0700)
Subject: Move mbstring initializaton to Setup.php, add checks
X-Git-Tag: 1.31.0-rc.0~6627^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=3b891947886106188eaaadd07046174fa78167b1;p=lhc%2Fweb%2Fwiklou.git

Move mbstring initializaton to Setup.php, add checks

Bug: T137509
Change-Id: Ib3496c9465a7b229b97793c6fa5dafb878c04968
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 2c78061750..878b147b61 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -45,6 +45,13 @@ if ( !isset( $wgVersion ) ) {
 	die( 1 );
 }
 
+if ( function_exists( 'mb_internal_encoding' ) ) {
+	mb_internal_encoding( 'UTF-8' );
+} elseif ( !defined( 'MEDIAWIKI_INSTALL' ) ) {
+	echo "Error: the mbstring PHP extension is required\n";
+	die( 1 );
+}
+
 // Set various default paths sensibly...
 $ps_default = Profiler::instance()->scopedProfileIn( $fname . '-defaults' );
 
diff --git a/languages/Language.php b/languages/Language.php
index 0a6ccd3eb2..f0c7d76c0a 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -30,8 +30,6 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 	exit( 1 );
 }
 
-mb_internal_encoding( 'UTF-8' );
-
 use CLDRPluralRuleParser\Evaluator;
 
 /**