From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 5 Jun 2007 17:53:28 +0000 (+0000)
Subject: LocalFile::restore(): roll back the DB transaction if the file is missing
X-Git-Tag: 1.31.0-rc.0~52658
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=11964dc236f2e2831080ff39896d0b18874dd9a9;p=lhc%2Fweb%2Fwiklou.git

LocalFile::restore(): roll back the DB transaction if the file is missing
---

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index cd0a331ebd..418d56afcc 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -1261,6 +1261,7 @@ class LocalFile extends File
 		} catch( MWException $e ) {
 			wfDebug( __METHOD__." caught error, aborting\n" );
 			$transaction->rollback();
+			$dbw->rollback();
 			throw $e;
 		}