From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Mon, 5 Dec 2011 07:03:21 +0000 (+0000)
Subject: Revert r105140 temporarily. The exception is thrown while running the parser tests... 
X-Git-Tag: 1.31.0-rc.0~26180
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dcompta/operations/modifier.php?a=commitdiff_plain;h=cfab36dd59977a3275f34cfd93b7e3995acf2b58;p=lhc%2Fweb%2Fwiklou.git

Revert r105140 temporarily. The exception is thrown while running the parser tests (at least from Jenkins, haven't tried locally), which completely breaks the test suite and renders Jenkins useless. Feel free to reapply once the cause of the oi_archive_name bug is fixed and committing this won't cause exceptions to be thrown in Jenkins's face.
---

diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 74eb0c7d9d..df7144330e 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1007,9 +1007,6 @@ class LocalFile extends File {
 		);
 
 		if ( $dbw->affectedRows() == 0 ) {
-			if ( $oldver == '' ) {
-				throw new MWException( "Empty oi_archive_name. Database and storage out of sync?" );
-			}
 			$reupload = true;
 
 			# Collision, this is an update of a file