jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Remove mismatched COMMIT from FileDeleteForm"
......................................................................
Revert "Remove mismatched COMMIT from FileDeleteForm"
The doDeleteArticleReal() call does BEGIN but not COMMIT
and the LocalFile::delete() does no trx commands because
trxLevel() > 0, so the COMMIT here is needed as things are.
This reverts commit 985a8f721459ebea1dc5a0daa178295eec8cf444.
Change-Id: I72529965ae9fe41641f22af12a40ec13ff65a2c1
---
M includes/FileDeleteForm.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index ae186bc..bcd6db2 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -195,7 +195,9 @@
// or revision is missing, so check for isOK()
rather than isGood()
if ( $deleteStatus->isOK() ) {
$status = $file->delete( $reason,
$suppress, $user );
- if ( !$status->isOK() ) {
+ if ( $status->isOK() ) {
+ $dbw->commit( __METHOD__ );
+ } else {
$dbw->rollback( __METHOD__ );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/243986
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I72529965ae9fe41641f22af12a40ec13ff65a2c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
