Removed useless begin()/commit() calls as DBO_TRX is not on in cli mode.
authorAaron Schulz <aschulz@wikimedia.org>
Tue, 25 Sep 2012 03:00:09 +0000 (20:00 -0700)
committerAaron Schulz <aschulz@wikimedia.org>
Tue, 25 Sep 2012 03:00:09 +0000 (20:00 -0700)
Change-Id: Icb80c26b64ace1f36871c6a9c772aaf1dfa6a111

includes/upload/UploadStash.php

index c7fd23a..bbd9c44 100644 (file)
@@ -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.