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
More clean up of oracle/mssql
[lhc/web/wiklou.git]
/
includes
/
installer
/
DatabaseInstaller.php
diff --git
a/includes/installer/DatabaseInstaller.php
b/includes/installer/DatabaseInstaller.php
index
f947979
..
8b94d97
100644
(file)
--- a/
includes/installer/DatabaseInstaller.php
+++ b/
includes/installer/DatabaseInstaller.php
@@
-20,6
+20,8
@@
* @file
* @ingroup Deployment
*/
* @file
* @ingroup Deployment
*/
+
+use MediaWiki\MediaWikiServices;
use Wikimedia\Rdbms\LBFactorySingle;
use Wikimedia\Rdbms\Database;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\LBFactorySingle;
use Wikimedia\Rdbms\Database;
use Wikimedia\Rdbms\IDatabase;
@@
-359,8
+361,8
@@
abstract class DatabaseInstaller {
throw new MWException( __METHOD__ . ': unexpected DB connection error' );
}
throw new MWException( __METHOD__ . ': unexpected DB connection error' );
}
-
\MediaWiki\
MediaWikiServices::resetGlobalInstance();
- $services =
\MediaWiki\
MediaWikiServices::getInstance();
+ MediaWikiServices::resetGlobalInstance();
+ $services = MediaWikiServices::getInstance();
$connection = $status->value;
$services->redefineService( 'DBLoadBalancerFactory', function () use ( $connection ) {
$connection = $status->value;
$services->redefineService( 'DBLoadBalancerFactory', function () use ( $connection ) {
@@
-445,8
+447,7
@@
abstract class DatabaseInstaller {
* @return string
*/
public function getReadableName() {
* @return string
*/
public function getReadableName() {
- // Messages: config-type-mysql, config-type-postgres, config-type-sqlite,
- // config-type-oracle
+ // Messages: config-type-mysql, config-type-postgres, config-type-sqlite
return wfMessage( 'config-type-' . $this->getName() )->text();
}
return wfMessage( 'config-type-' . $this->getName() )->text();
}