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
Move l10n_cache table to a separate DB for sqlite via the installer
[lhc/web/wiklou.git]
/
includes
/
Setup.php
diff --git
a/includes/Setup.php
b/includes/Setup.php
index
e2fab45
..
9923ae2
100644
(file)
--- a/
includes/Setup.php
+++ b/
includes/Setup.php
@@
-278,7
+278,7
@@
$wgGalleryOptions += [
];
/**
];
/**
- *
Initialise $wgLocalFileRepo from backwards-compatible settings
+ *
Shortcuts for $wgLocalFileRepo
*/
if ( !$wgLocalFileRepo ) {
$wgLocalFileRepo = [
*/
if ( !$wgLocalFileRepo ) {
$wgLocalFileRepo = [
@@
-294,8
+294,15
@@
if ( !$wgLocalFileRepo ) {
'deletedHashLevels' => $wgHashedUploadDirectory ? 3 : 0
];
}
'deletedHashLevels' => $wgHashedUploadDirectory ? 3 : 0
];
}
+
+if ( !isset( $wgLocalFileRepo['backend'] ) ) {
+ // Create a default FileBackend name.
+ // FileBackendGroup will register a default, if absent from $wgFileBackends.
+ $wgLocalFileRepo['backend'] = $wgLocalFileRepo['name'] . '-backend';
+}
+
/**
/**
- *
Initialise shared repo from backwards-compatible setting
s
+ *
Shortcuts for $wgForeignFileRepo
s
*/
if ( $wgUseSharedUploads ) {
if ( $wgSharedUploadDBname ) {
*/
if ( $wgUseSharedUploads ) {
if ( $wgSharedUploadDBname ) {
@@
-346,13
+353,6
@@
if ( $wgUseInstantCommons ) {
'apiThumbCacheExpiry' => 0,
];
}
'apiThumbCacheExpiry' => 0,
];
}
-/*
- * Add on default file backend config for file repos.
- * FileBackendGroup will handle initializing the backends.
- */
-if ( !isset( $wgLocalFileRepo['backend'] ) ) {
- $wgLocalFileRepo['backend'] = $wgLocalFileRepo['name'] . '-backend';
-}
foreach ( $wgForeignFileRepos as &$repo ) {
if ( !isset( $repo['directory'] ) && $repo['class'] === ForeignAPIRepo::class ) {
$repo['directory'] = $wgUploadDirectory; // b/c
foreach ( $wgForeignFileRepos as &$repo ) {
if ( !isset( $repo['directory'] ) && $repo['class'] === ForeignAPIRepo::class ) {
$repo['directory'] = $wgUploadDirectory; // b/c
@@
-794,9
+794,9
@@
$ps_globals = Profiler::instance()->scopedProfileIn( $fname . '-globals' );
/**
* @var Language $wgContLang
/**
* @var Language $wgContLang
+ * @deprecated since 1.32, use the ContentLanguage service directly
*/
*/
-$wgContLang = Language::factory( $wgLanguageCode );
-$wgContLang->initContLang();
+$wgContLang = MediaWikiServices::getInstance()->getContentLanguage();
// Now that variant lists may be available...
$wgRequest->interpolateTitle();
// Now that variant lists may be available...
$wgRequest->interpolateTitle();
@@
-825,7
+825,7
@@
$wgInitialSessionId = null;
if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
// If session.auto_start is there, we can't touch session name
if ( $wgPHPSessionHandling !== 'disable' && !wfIniGetBool( 'session.auto_start' ) ) {
if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
// If session.auto_start is there, we can't touch session name
if ( $wgPHPSessionHandling !== 'disable' && !wfIniGetBool( 'session.auto_start' ) ) {
- session_name( $wgSessionName ?
$wgSessionName
: $wgCookiePrefix . '_session' );
+ session_name( $wgSessionName ?: $wgCookiePrefix . '_session' );
}
// Create the SessionManager singleton and set up our session handler,
}
// Create the SessionManager singleton and set up our session handler,