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 getSearchEngine() from DatabaseBase"
[lhc/web/wiklou.git]
/
maintenance
/
deleteOrphanedRevisions.php
diff --git
a/maintenance/deleteOrphanedRevisions.php
b/maintenance/deleteOrphanedRevisions.php
index
7f1ffe4
..
507a494
100644
(file)
--- a/
maintenance/deleteOrphanedRevisions.php
+++ b/
maintenance/deleteOrphanedRevisions.php
@@
-34,7
+34,8
@@
require_once __DIR__ . '/Maintenance.php';
class DeleteOrphanedRevisions extends Maintenance {
public function __construct() {
parent::__construct();
class DeleteOrphanedRevisions extends Maintenance {
public function __construct() {
parent::__construct();
- $this->mDescription = "Maintenance script to delete revisions which refer to a nonexisting page";
+ $this->addDescription(
+ 'Maintenance script to delete revisions which refer to a nonexisting page' );
$this->addOption( 'report', 'Prints out a count of affected revisions but doesn\'t delete them' );
}
$this->addOption( 'report', 'Prints out a count of affected revisions but doesn\'t delete them' );
}
@@
-43,8
+44,8
@@
class DeleteOrphanedRevisions extends Maintenance {
$report = $this->hasOption( 'report' );
$report = $this->hasOption( 'report' );
- $dbw =
wfG
etDB( DB_MASTER );
- $
dbw->begin(
__METHOD__ );
+ $dbw =
$this->g
etDB( DB_MASTER );
+ $
this->beginTransaction( $dbw,
__METHOD__ );
list( $page, $revision ) = $dbw->tableNamesN( 'page', 'revision' );
# Find all the orphaned revisions
list( $page, $revision ) = $dbw->tableNamesN( 'page', 'revision' );
# Find all the orphaned revisions
@@
-54,7
+55,7
@@
class DeleteOrphanedRevisions extends Maintenance {
$res = $dbw->query( $sql, 'deleteOrphanedRevisions' );
# Stash 'em all up for deletion (if needed)
$res = $dbw->query( $sql, 'deleteOrphanedRevisions' );
# Stash 'em all up for deletion (if needed)
- $revisions =
array()
;
+ $revisions =
[]
;
foreach ( $res as $row ) {
$revisions[] = $row->rev_id;
}
foreach ( $res as $row ) {
$revisions[] = $row->rev_id;
}
@@
-63,7
+64,7
@@
class DeleteOrphanedRevisions extends Maintenance {
# Nothing to do?
if ( $report || $count == 0 ) {
# Nothing to do?
if ( $report || $count == 0 ) {
- $
dbw->commit(
__METHOD__ );
+ $
this->commitTransaction( $dbw,
__METHOD__ );
exit( 0 );
}
exit( 0 );
}
@@
-73,7
+74,7
@@
class DeleteOrphanedRevisions extends Maintenance {
$this->output( "done.\n" );
# Close the transaction and call the script to purge unused text records
$this->output( "done.\n" );
# Close the transaction and call the script to purge unused text records
- $
dbw->commit(
__METHOD__ );
+ $
this->commitTransaction( $dbw,
__METHOD__ );
$this->purgeRedundantText( true );
}
$this->purgeRedundantText( true );
}
@@
-86,9
+87,9
@@
class DeleteOrphanedRevisions extends Maintenance {
*/
private function deleteRevs( $id, &$dbw ) {
if ( !is_array( $id ) ) {
*/
private function deleteRevs( $id, &$dbw ) {
if ( !is_array( $id ) ) {
- $id =
array( $id )
;
+ $id =
[ $id ]
;
}
}
- $dbw->delete( 'revision',
array( 'rev_id' => $id )
, __METHOD__ );
+ $dbw->delete( 'revision',
[ 'rev_id' => $id ]
, __METHOD__ );
}
}
}
}