From f58facad1c4e9413b6361b77db321490eebf69ab Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sun, 26 Apr 2015 10:19:19 -0700 Subject: [PATCH] Fixed transaction error while undeleting revdeleted files Bug: T97222 Change-Id: I16cdf228a517e93ac71ccda243b9e47b68ad7717 --- includes/filerepo/LocalRepo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php index 926fd0b8a8..e7e4c750ef 100644 --- a/includes/filerepo/LocalRepo.php +++ b/includes/filerepo/LocalRepo.php @@ -90,7 +90,7 @@ class LocalRepo extends FileRepo { foreach ( $storageKeys as $key ) { $hashPath = $this->getDeletedHashPath( $key ); $path = "$root/$hashPath$key"; - $dbw->begin( __METHOD__ ); + $dbw->startAtomic( __METHOD__ ); // Check for usage in deleted/hidden files and preemptively // lock the key to avoid any future use until we are finished. $deleted = $this->deletedFileHasKey( $key, 'lock' ); @@ -106,7 +106,7 @@ class LocalRepo extends FileRepo { wfDebug( __METHOD__ . ": $key still in use\n" ); $status->successCount++; } - $dbw->commit( __METHOD__ ); + $dbw->endAtomic( __METHOD__ ); } return $status; -- 2.20.1