A message (fileexists) with the same name of another one was introduced in r24313...

diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php
index d3d1b70..84ec9a2 100644 (file)
--- a/includes/filerepo/FSRepo.php
+++ b/includes/filerepo/FSRepo.php
@@ -166,10 +166,10 @@ class FSRepo extends FileRepo {
                                        $hashSource = sha1_file( $srcPath );
                                        $hashDest = sha1_file( $dstPath );
                                        if ( $hashSource != $hashDest ) {
-                                               $status->fatal( 'fileexists', $dstPath );
+                                               $status->fatal( 'fileexistserror', $dstPath );
                                        }
                                } else {
-                                       $status->fatal( 'fileexists', $dstPath );
+                                       $status->fatal( 'fileexistserror', $dstPath );
                                }
                        }
                }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 4383bb1..139b3e4 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -767,7 +767,7 @@ Please report this to an administrator, making note of the URL.',
 'filedeleteerror'      => 'Could not delete file "$1".',
 'directorycreateerror' => 'Could not create directory "$1".',
 'filenotfound'         => 'Could not find file "$1".',
-'fileexists'           => 'Unable to write to file "$1": file exists',
+'fileexistserror'      => 'Unable to write to file "$1": file exists',
 'unexpected'           => 'Unexpected value: "$1"="$2".',
 'formerror'            => 'Error: could not submit form',
 'badarticleerror'      => 'This action cannot be performed on this page.',

diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index 6ac53d5..98b5ed1 100644 (file)
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -505,7 +505,7 @@ $messages = array(
 'filedeleteerror'      => 'מחיקת "$1" נכשלה.',
 'directorycreateerror' => 'יצירת התיקייה "$1" נכשלה.',
 'filenotfound'         => 'הקובץ "$1" לא נמצא.',
-'fileexists'           => 'הכתיבה לקובץ "$1" נכשלה: הקובץ קיים',
+'fileexistserror'      => 'הכתיבה לקובץ "$1" נכשלה: הקובץ קיים',
 'unexpected'           => 'ערך לא צפוי: "$1"="$2"',
 'formerror'            => 'שגיאה: לא יכול לשלוח טופס.',
 'badarticleerror'      => 'לא ניתן לבצע פעולה זו בדף זה.',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index bcbdb4c..78644ce 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -304,7 +304,7 @@ $wgMessageStructure = array(
                'filedeleteerror',
                'directorycreateerror',
                'filenotfound',
-               'fileexists',
+               'fileexistserror',
                'unexpected',
                'formerror',
                'badarticleerror',