From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 25 Sep 2012 03:00:09 +0000 (-0700)
Subject: Removed useless begin()/commit() calls as DBO_TRX is not on in cli mode.
X-Git-Tag: 1.31.0-rc.0~22186^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=7cfc4f818ef4cd131a774429fffe2bd54b0d5a7f;p=lhc%2Fweb%2Fwiklou.git

Removed useless begin()/commit() calls as DBO_TRX is not on in cli mode.

Change-Id: Icb80c26b64ace1f36871c6a9c772aaf1dfa6a111
---

diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index c7fd23a9d5..bbd9c44024 100644
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -361,14 +361,11 @@ class UploadStash {
 
 		$dbw = $this->repo->getMasterDb();
 
-		// this gets its own transaction since it's called serially by the cleanupUploadStash maintenance script
-		$dbw->begin( __METHOD__ );
 		$dbw->delete(
 			'uploadstash',
 			array( 'us_key' => $key ),
 			__METHOD__
 		);
-		$dbw->commit( __METHOD__ );
 
 		// TODO: look into UnregisteredLocalFile and find out why the rv here is sometimes wrong (false when file was removed)
 		// for now, ignore.