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 "Move @group and @covers tags in tests close to class"
[lhc/web/wiklou.git]
/
includes
/
filebackend
/
filejournal
/
DBFileJournal.php
diff --git
a/includes/filebackend/filejournal/DBFileJournal.php
b/includes/filebackend/filejournal/DBFileJournal.php
index
aa97c9a
..
4269f91
100644
(file)
--- a/
includes/filebackend/filejournal/DBFileJournal.php
+++ b/
includes/filebackend/filejournal/DBFileJournal.php
@@
-19,7
+19,6
@@
*
* @file
* @ingroup FileJournal
*
* @file
* @ingroup FileJournal
- * @author Aaron Schulz
*/
use MediaWiki\MediaWikiServices;
*/
use MediaWiki\MediaWikiServices;
@@
-184,7
+183,7
@@
class DBFileJournal extends FileJournal {
protected function getMasterDB() {
if ( !$this->dbw ) {
// Get a separate connection in autocommit mode
protected function getMasterDB() {
if ( !$this->dbw ) {
// Get a separate connection in autocommit mode
- $lb =
MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->newMainLB();
+ $lb = MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->newMainLB();
$this->dbw = $lb->getConnection( DB_MASTER, [], $this->wiki );
$this->dbw->clearFlag( DBO_TRX );
}
$this->dbw = $lb->getConnection( DB_MASTER, [], $this->wiki );
$this->dbw->clearFlag( DBO_TRX );
}