From d163d85ea24f1f6f5f37ca1e7ce076f7e3c995f5 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 1 Jan 2012 23:33:33 +0000
Subject: [PATCH] Followup r106752

Use $file in unlink, rather than the undefined $path
---
 includes/filerepo/FileRepo.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 46ffb32414..75c4882ef3 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -653,7 +653,7 @@ class FileRepo {
 		$operations = array();
 		$sourceFSFilesToDelete = array(); // cleanup for disk source files
 		// Validate each triplet and get the store operation...
-		foreach ( $triplets as $i => $triplet ) {
+		foreach ( $triplets as $triplet ) {
 			list( $srcPath, $dstZone, $dstRel ) = $triplet;
 
 			// Resolve destination path
@@ -760,7 +760,7 @@ class FileRepo {
 		// Cleanup for disk source files...
 		foreach ( $sourceFSFilesToDelete as $file ) {
 			wfSuppressWarnings();
-			unlink( $path ); // FS cleanup
+			unlink( $file ); // FS cleanup
 			wfRestoreWarnings();
 		}
 	}
-- 
2.20.1