dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "resources: Move various single-file mediawiki.* modules to src/"
[lhc/web/wiklou.git]
/
includes
/
Setup.php
diff --git
a/includes/Setup.php
b/includes/Setup.php
index
ac47b6f
..
5cc9a96
100644
(file)
--- a/
includes/Setup.php
+++ b/
includes/Setup.php
@@
-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
require_once "$IP/includes/AutoLoader.php";
// Start the autoloader, so that extensions can derive classes from core files
require_once "$IP/includes/AutoLoader.php";
@@
-80,7
+85,7
@@
MediaWiki\HeaderCallback::register();
*/
if ( is_readable( "$IP/StartProfiler.php" ) ) {
*/
if ( is_readable( "$IP/StartProfiler.php" ) ) {
- // @deprecated since 1.3
1
: Use LocalSettings.php instead.
+ // @deprecated since 1.3
2
: Use LocalSettings.php instead.
require "$IP/StartProfiler.php";
}
require "$IP/StartProfiler.php";
}
@@
-279,7
+284,6
@@
if ( !$wgLocalFileRepo ) {
'name' => 'local',
'directory' => $wgUploadDirectory,
'scriptDirUrl' => $wgScriptPath,
'name' => 'local',
'directory' => $wgUploadDirectory,
'scriptDirUrl' => $wgScriptPath,
- 'scriptExtension' => '.php',
'url' => $wgUploadBaseUrl ? $wgUploadBaseUrl . $wgUploadPath : $wgUploadPath,
'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
'thumbScriptUrl' => $wgThumbnailScriptPath,
'url' => $wgUploadBaseUrl ? $wgUploadBaseUrl . $wgUploadPath : $wgUploadPath,
'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
'thumbScriptUrl' => $wgThumbnailScriptPath,
@@
-357,12
+361,6
@@
foreach ( $wgForeignFileRepos as &$repo ) {
}
unset( $repo ); // no global pollution; destroy reference
}
unset( $repo ); // no global pollution; destroy reference
-// Convert this deprecated setting to modern system
-if ( $wgExperimentalHtmlIds ) {
- wfDeprecated( '$wgExperimentalHtmlIds', '1.30' );
- $wgFragmentMode = [ 'html5-legacy', 'html5' ];
-}
-
$rcMaxAgeDays = $wgRCMaxAge / ( 3600 * 24 );
if ( $wgRCFilterByAge ) {
// Trim down $wgRCLinkDays so that it only lists links which are valid
$rcMaxAgeDays = $wgRCMaxAge / ( 3600 * 24 );
if ( $wgRCFilterByAge ) {
// Trim down $wgRCLinkDays so that it only lists links which are valid