Fix for r60418, need to check whether the /destination/ file exists

locally, not the file at the current title

diff --git a/includes/Title.php b/includes/Title.php
index 89b01f4..d0fee24 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2686,7 +2686,9 @@ class Title {
                                if( !File::checkExtensionCompatibility( $file, $nt->getDBkey() ) ) {
                                        $errors[] = array('imagetypemismatch');
                                }
-                       } elseif( !$wgUser->isAllowed( 'reupload-shared' ) && wfFindFile( $nt ) ) {
+                       } 
+                       $destfile = wfLocalFile( $nt );
+                       if( !$wgUser->isAllowed( 'reupload-shared' ) && !$destfile->exists() && wfFindFile( $nt ) ) {
                                $errors[] = array( 'file-exists-sharedrepo' );
                        }