Don't move the destination to the archive until we have checked that the source file...

diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php
index a75ba7a..dc40444 100644 (file)
--- a/includes/filerepo/FSRepo.php
+++ b/includes/filerepo/FSRepo.php
@@ -214,6 +214,11 @@ class FSRepo extends FileRepo {
                $dstDir = dirname( $dstPath );
                if ( !is_dir( $dstDir ) ) wfMkdirParents( $dstDir );
 
+               // Check if the source is missing before we attempt to move the dest to archive
+               if ( !is_file( $srcPath ) ) {
+                       return new WikiErrorMsg( 'filenotfound', wfEscapeWikiText( $srcPath ) );
+               }
+
                if( is_file( $dstPath ) ) {
                        $archiveDir = dirname( $archivePath );
                        if ( !is_dir( $archiveDir ) ) wfMkdirParents( $archiveDir );