Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304694
Change subject: Switch commit() to commitMasterChanges() for better consistency
......................................................................
Switch commit() to commitMasterChanges() for better consistency
Change-Id: I0f7604b7c91ade016f3395d11f887b15f0b8673e
---
M DeleteBatch.body.php
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DeleteBatch
refs/changes/94/304694/1
diff --git a/DeleteBatch.body.php b/DeleteBatch.body.php
index 9d28d97..17d67de 100644
--- a/DeleteBatch.body.php
+++ b/DeleteBatch.body.php
@@ -346,7 +346,6 @@
}
}
- $db->begin();
/* this stuff goes like articleFromTitle in Wiki.php */
// Delete the page; in the case of a file, this would be the
File: description page
if ( $pageExists ) {
@@ -364,8 +363,10 @@
// deleted, and now we are just cleaning up after a
deletion script
// that didn't finish the job by deleting the file too.
$localFile->delete( $reason );
+ // Flush DBs in case of fragile file operations
+ wfGetLBFactory()->commitMasterChanges( __METHOD__ );
}
- $db->commit();
+
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/304694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f7604b7c91ade016f3395d11f887b15f0b8673e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DeleteBatch
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits