From 14824635416d8fca2202f2ad0bc472df453d4b25 Mon Sep 17 00:00:00 2001 From: Greg Sabino Mullane Date: Sun, 10 Feb 2008 16:59:44 +0000 Subject: [PATCH] Delete from oldimage, then image, to account for possible foreign keys. Bug 12520. ISAKA Yoji. --- includes/filerepo/LocalFile.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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__ ); + } } /** -- 2.20.1