labels for custom restriction levels
* Show edit count in user preferences
* Improved support for audio/video extensions
+* (bug 10937) Distinguish overwritten files in upload log
== Bugfixes since 1.10 ==
'delete/restore' => 'undeletedarticle',
'delete/revision' => 'revdelete-logentry',
'upload/upload' => 'uploadedimage',
+ 'upload/overwrite' => 'overwroteimage',
'upload/revert' => 'uploadedimage',
'move/move' => '1movedto2',
'move/move_redir' => '1movedto2_redir',
return false;
}
+ $reupload = false;
if ( $timestamp === false ) {
$timestamp = $dbw->timestamp();
}
);
if( $dbw->affectedRows() == 0 ) {
+ $reupload = true;
+
# Collision, this is an update of a file
# Insert previous contents into oldimage
$dbw->insertSelect( 'oldimage', 'image',
# Add the log entry
$log = new LogPage( 'upload' );
- $log->addEntry( 'upload', $descTitle, $comment );
+ $action = $reupload ? 'overwrite' : 'upload';
+ $log->addEntry( $action, $descTitle, $comment );
if( $descTitle->exists() ) {
# Create a null revision
'uploadwarning' => 'Upload warning',
'savefile' => 'Save file',
'uploadedimage' => 'uploaded "[[$1]]"',
+'overwroteimage' => 'uploaded a new version of "[[$1]]"',
'uploaddisabled' => 'Uploads disabled',
'uploaddisabledtext' => 'File uploads are disabled on this wiki.',
'uploadscripted' => 'This file contains HTML or script code that may be erroneously be interpreted by a web browser.',