(bug 26848) deleteArchivedFiles.php deletes db records, but not files

diff --git a/maintenance/deleteArchivedFiles.inc b/maintenance/deleteArchivedFiles.inc
index e0ac225..68394b4 100644 (file)
--- a/maintenance/deleteArchivedFiles.inc
+++ b/maintenance/deleteArchivedFiles.inc
@@ -45,9 +45,12 @@ class DeleteArchivedFilesImplementation {
                                array( 'FOR UPDATE' )
                        );
                        if ( $path && file_exists( $path ) && !$inuse ) {
-                               unlink( $path ); // delete
-                               $count++;
-                               $dbw->query( "DELETE FROM $tbl_arch WHERE fa_id = $id" );
+                               if( unlink( $path ) ) { // delete
+                                       $count++;
+                                       $dbw->query( "DELETE FROM $tbl_arch WHERE fa_id = $id" );
+                               } else {
+                                       $output->handleOutput( "Unable to remove file $path, skipping\n" );
+                               }
                        } else {
                                $output->handleOutput( "Notice - file '$key' not found in group '$group'\n" );
                                if ( $force ) {