r107790 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r107789‎ | r107790 | r107791 >
Date:23:33, 1 January 2012
Author:reedy
Status:ok
Tags:
Comment:
Followup r106752

Use $file in unlink, rather than the undefined $path
Modified paths:
  • /trunk/phase3/includes/filerepo/FileRepo.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/filerepo/FileRepo.php
@@ -653,7 +653,7 @@
654654 $operations = array();
655655 $sourceFSFilesToDelete = array(); // cleanup for disk source files
656656 // Validate each triplet and get the store operation...
657 - foreach ( $triplets as $i => $triplet ) {
 657+ foreach ( $triplets as $triplet ) {
658658 list( $srcPath, $dstZone, $dstRel ) = $triplet;
659659
660660 // Resolve destination path
@@ -760,7 +760,7 @@
761761 // Cleanup for disk source files...
762762 foreach ( $sourceFSFilesToDelete as $file ) {
763763 wfSuppressWarnings();
764 - unlink( $path ); // FS cleanup
 764+ unlink( $file ); // FS cleanup
765765 wfRestoreWarnings();
766766 }
767767 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r106752Merged FileBackend branch. Manually avoiding merging the many prop-only chang...aaron03:52, 20 December 2011

Status & tagging log