From 985a8f721459ebea1dc5a0daa178295eec8cf444 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Fri, 2 Oct 2015 18:04:45 -0700 Subject: [PATCH] Remove mismatched COMMIT from FileDeleteForm * Rely on the main DBO_TRX to commit at request end Change-Id: Iad545db3603335baddc4156128f1dd756dbe99b4 --- includes/FileDeleteForm.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php index bcd6db2026..ae186bc950 100644 --- a/includes/FileDeleteForm.php +++ b/includes/FileDeleteForm.php @@ -195,9 +195,7 @@ class FileDeleteForm { // 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__ ); } } -- 2.20.1