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 "Remove unnecesary else blocks"
[lhc/web/wiklou.git]
/
includes
/
db
/
MWLBFactory.php
diff --git
a/includes/db/MWLBFactory.php
b/includes/db/MWLBFactory.php
index
82d9c1d
..
e50f855
100644
(file)
--- a/
includes/db/MWLBFactory.php
+++ b/
includes/db/MWLBFactory.php
@@
-65,6
+65,7
@@
abstract class MWLBFactory {
'cliMode' => $wgCommandLineMode,
'hostname' => wfHostname(),
'readOnlyReason' => $readOnlyMode->getReason(),
'cliMode' => $wgCommandLineMode,
'hostname' => wfHostname(),
'readOnlyReason' => $readOnlyMode->getReason(),
+ 'defaultGroup' => $mainConfig->get( 'DBDefaultGroup' ),
];
// When making changes here, remember to also specify MediaWiki-specific options
];
// When making changes here, remember to also specify MediaWiki-specific options
@@
-208,10
+209,8
@@
abstract class MWLBFactory {
return $class;
}
return $class;
}
- public static function setSchemaAliases( LBFactory $lbFactory ) {
- $mainLB = $lbFactory->getMainLB();
- $masterType = $mainLB->getServerType( $mainLB->getWriterIndex() );
- if ( $masterType === 'mysql' ) {
+ public static function setSchemaAliases( LBFactory $lbFactory, Config $config ) {
+ if ( $config->get( 'DBtype' ) === 'mysql' ) {
/**
* When SQLite indexes were introduced in r45764, it was noted that
* SQLite requires index names to be unique within the whole database,
/**
* When SQLite indexes were introduced in r45764, it was noted that
* SQLite requires index names to be unique within the whole database,