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 "Update justinrainbow/json-schema in require-dev to ~1.6"
[lhc/web/wiklou.git]
/
includes
/
installer
/
DatabaseUpdater.php
diff --git
a/includes/installer/DatabaseUpdater.php
b/includes/installer/DatabaseUpdater.php
index
6a20abc
..
86b2f3b
100644
(file)
--- a/
includes/installer/DatabaseUpdater.php
+++ b/
includes/installer/DatabaseUpdater.php
@@
-75,6
+75,7
@@
abstract class DatabaseUpdater {
PopulateFilearchiveSha1::class,
PopulateBacklinkNamespace::class,
FixDefaultJsonContentPages::class,
PopulateFilearchiveSha1::class,
PopulateBacklinkNamespace::class,
FixDefaultJsonContentPages::class,
+ CleanupEmptyCategories::class,
];
/**
];
/**
@@
-409,7
+410,6
@@
abstract class DatabaseUpdater {
public function doUpdates( $what = [ 'core', 'extensions', 'stats' ] ) {
global $wgVersion;
public function doUpdates( $what = [ 'core', 'extensions', 'stats' ] ) {
global $wgVersion;
- $this->db->begin( __METHOD__ );
$what = array_flip( $what );
$this->skipSchema = isset( $what['noschema'] ) || $this->fileHandle !== null;
if ( isset( $what['core'] ) ) {
$what = array_flip( $what );
$this->skipSchema = isset( $what['noschema'] ) || $this->fileHandle !== null;
if ( isset( $what['core'] ) ) {
@@
-431,8
+431,6
@@
abstract class DatabaseUpdater {
$this->writeSchemaUpdateFile();
$this->setAppliedUpdates( "$wgVersion-schema", $this->updatesSkipped );
}
$this->writeSchemaUpdateFile();
$this->setAppliedUpdates( "$wgVersion-schema", $this->updatesSkipped );
}
-
- $this->db->commit( __METHOD__ );
}
/**
}
/**