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
resourceloader: Update expected length of module version hash
[lhc/web/wiklou.git]
/
includes
/
Setup.php
diff --git
a/includes/Setup.php
b/includes/Setup.php
index
e57b96a
..
cb1bd71
100644
(file)
--- a/
includes/Setup.php
+++ b/
includes/Setup.php
@@
-45,6
+45,8
@@
if ( !isset( $wgVersion ) ) {
die( 1 );
}
die( 1 );
}
+mb_internal_encoding( 'UTF-8' );
+
// Set various default paths sensibly...
$ps_default = Profiler::instance()->scopedProfileIn( $fname . '-defaults' );
// Set various default paths sensibly...
$ps_default = Profiler::instance()->scopedProfileIn( $fname . '-defaults' );
@@
-517,7
+519,7
@@
if ( !class_exists( 'AutoLoader' ) ) {
// Reset the global service locator, so any services that have already been created will be
// re-created while taking into account any custom settings and extensions.
// Reset the global service locator, so any services that have already been created will be
// re-created while taking into account any custom settings and extensions.
-MediaWikiServices::resetGlobalInstance( new GlobalVarConfig() );
+MediaWikiServices::resetGlobalInstance( new GlobalVarConfig()
, 'quick'
);
// Define a constant that indicates that the bootstrapping of the service locator
// is complete.
// Define a constant that indicates that the bootstrapping of the service locator
// is complete.
@@
-688,7
+690,9
@@
wfDebugLog( 'caches',
', WAN: ' . $wgMainWANCache .
', stash: ' . $wgMainStash .
', message: ' . get_class( $messageMemc ) .
', WAN: ' . $wgMainWANCache .
', stash: ' . $wgMainStash .
', message: ' . get_class( $messageMemc ) .
- ', parser: ' . get_class( $parserMemc ) );
+ ', parser: ' . get_class( $parserMemc ) .
+ ', session: ' . get_class( ObjectCache::getInstance( $wgSessionCacheType ) )
+);
Profiler::instance()->scopedProfileOut( $ps_memcached );
Profiler::instance()->scopedProfileOut( $ps_memcached );
@@
-850,15
+854,20
@@
if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
if ( $sessionUser->getId() === 0 && User::isValidUserName( $sessionUser->getName() ) ) {
$ps_autocreate = Profiler::instance()->scopedProfileIn( $fname . '-autocreate' );
if ( $wgDisableAuthManager ) {
if ( $sessionUser->getId() === 0 && User::isValidUserName( $sessionUser->getName() ) ) {
$ps_autocreate = Profiler::instance()->scopedProfileIn( $fname . '-autocreate' );
if ( $wgDisableAuthManager ) {
- MediaWiki\Session\SessionManager::autoCreateUser( $sessionUser );
+
$res =
MediaWiki\Session\SessionManager::autoCreateUser( $sessionUser );
} else {
} else {
- MediaWiki\Auth\AuthManager::singleton()->autoCreateUser(
+
$res =
MediaWiki\Auth\AuthManager::singleton()->autoCreateUser(
$sessionUser,
$sessionUser,
- MediaWiki\Auth\AuthManager::AUTOCREATE_SOURCE_SESS
S
ION,
+ MediaWiki\Auth\AuthManager::AUTOCREATE_SOURCE_SESSION,
true
);
}
Profiler::instance()->scopedProfileOut( $ps_autocreate );
true
);
}
Profiler::instance()->scopedProfileOut( $ps_autocreate );
+ \MediaWiki\Logger\LoggerFactory::getInstance( 'authmanager' )->info( 'Autocreation attempt', [
+ 'event' => 'autocreate',
+ 'status' => $res,
+ ] );
+ unset( $res );
}
unset( $sessionUser );
}
}
unset( $sessionUser );
}