From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Sun, 10 Feb 2008 16:59:44 +0000 (+0000)
Subject: Delete from oldimage, then image, to account for possible foreign keys. Bug 12520... 
X-Git-Tag: 1.31.0-rc.0~49526
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=14824635416d8fca2202f2ad0bc472df453d4b25;p=lhc%2Fweb%2Fwiklou.git

Delete from oldimage, then image, to account for possible foreign keys. Bug 12520. ISAKA Yoji.
---

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index f992aa3838..9b06fe2d8f 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -1308,9 +1308,6 @@ class LocalFileDeleteBatch {
 	function doDBDeletes() {
 		$dbw = $this->file->repo->getMasterDB();
 		list( $oldRels, $deleteCurrent ) = $this->getOldRels();
-		if ( $deleteCurrent ) {
-			$dbw->delete( 'image', array( 'img_name' => $this->file->getName() ), __METHOD__ );
-		}
 		if ( count( $oldRels ) ) {
 			$dbw->delete( 'oldimage', 
 				array(
@@ -1318,6 +1315,9 @@ class LocalFileDeleteBatch {
 					'oi_archive_name IN (' . $dbw->makeList( array_keys( $oldRels ) ) . ')' 
 				), __METHOD__ );
 		}
+		if ( $deleteCurrent ) {
+			$dbw->delete( 'image', array( 'img_name' => $this->file->getName() ), __METHOD__ );
+		}
 	}
 
 	/**