Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

filerepo: make FileDeleteForm use cancelAtomic() instead of rollbackPrimaryChanges

Browse source 
Bug: T297424
Change-Id: Ic72dbe227dfcb51c8cf3544cf14bd66e84967c46
This commit is contained in:
Aaron Schulz 2021-12-14 20:17:28 -08:00 committed by Krinkle
parent 82d4dab9a3
commit 4061b3cbe6
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/FileDeleteForm.php
View file

@ -90,7 +90,7 @@ class FileDeleteForm {
$deletePage->setDeleteAssociatedTalk( true );
}
$dbw = wfGetDB( DB_PRIMARY );
$dbw->startAtomic( __METHOD__ );
$dbw->startAtomic( __METHOD__, $dbw::ATOMIC_CANCELABLE );
// delete the associated article first
$deleteStatus = $deletePage
->setSuppress( $suppress )
@ -129,8 +129,7 @@ class FileDeleteForm {
$dbw->endAtomic( __METHOD__ );
} else {
// Page deleted but file still there? rollback page delete
$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
$lbFactory->rollbackPrimaryChanges( __METHOD__ );
$dbw->cancelAtomic( __METHOD__ );
}
} else {
$dbw->endAtomic( __METHOD__ );