From 6b5a299db5f8381396c62b65605eb5e7548e974f Mon Sep 17 00:00:00 2001 From: Bryan Tong Minh Date: Thu, 30 Jun 2011 17:43:20 +0000 Subject: [PATCH] Follow-up r81536: Properly extract ($dstZone, $dstRel) from the triplet. --- includes/filerepo/LocalFile.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php index 3a6666a5be..1c9040b75d 100644 --- a/includes/filerepo/LocalFile.php +++ b/includes/filerepo/LocalFile.php @@ -1981,8 +1981,11 @@ class LocalFileRestoreBatch { $cleanupBatch = array(); foreach ( $storeStatus->success as $i => $success ) { + // Check if this item of the batch was successfully copied if ( $success ) { - $cleanupBatch[] = array( $storeBatch[$i][1], $storeBatch[$i][1] ); + // Item was successfully copied and needs to be removed again + // Extract ($dstZone, $dstRel) from the batch + $cleanupBatch[] = array( $storeBatch[$i][1], $storeBatch[$i][2] ); } } $this->file->repo->cleanupBatch( $cleanupBatch ); -- 2.20.1