Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/243361
Change subject: Remove mismatched COMMIT from FileDeleteForm
......................................................................
Remove mismatched COMMIT from FileDeleteForm
* Rely on the main DBO_TRX to commit at request end
Change-Id: Iad545db3603335baddc4156128f1dd756dbe99b4
---
M includes/FileDeleteForm.php
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/61/243361/1
diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index bcd6db2..ae186bc 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -195,9 +195,7 @@
// or revision is missing, so check for isOK()
rather than isGood()
if ( $deleteStatus->isOK() ) {
$status = $file->delete( $reason,
$suppress, $user );
- if ( $status->isOK() ) {
- $dbw->commit( __METHOD__ );
- } else {
+ if ( !$status->isOK() ) {
$dbw->rollback( __METHOD__ );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/243361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad545db3603335baddc4156128f1dd756dbe99b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
