http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65339
Revision: 65339
Author: churchofemacs
Date: 2010-04-20 20:30:11 +0000 (Tue, 20 Apr 2010)
Log Message:
-----------
When visiting a 'red link' of a deleted file, a deletion and move log excerpt
is provided on the Upload form.
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/specials/SpecialUpload.php
trunk/phase3/languages/messages/MessagesEn.php
Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES 2010-04-20 19:10:13 UTC (rev 65338)
+++ trunk/phase3/RELEASE-NOTES 2010-04-20 20:30:11 UTC (rev 65339)
@@ -49,6 +49,8 @@
* Special:Listfiles now supports a username parameter
* Special:Random carries over query string parameters
* (bug 23206) Add Special::Search hook for detecting successful "Go"
+* When visiting a "red link" of a deleted file, a deletion and move log excerpt
+ is provided on the Upload form.
=== Bug fixes in 1.17 ===
* (bug 17560) Half-broken deletion moved image files to deletion archive
Modified: trunk/phase3/includes/specials/SpecialUpload.php
===================================================================
--- trunk/phase3/includes/specials/SpecialUpload.php 2010-04-20 19:10:13 UTC
(rev 65338)
+++ trunk/phase3/includes/specials/SpecialUpload.php 2010-04-20 20:30:11 UTC
(rev 65339)
@@ -237,6 +237,21 @@
$form->addPreText( wfMsgExt( 'session_fail_preview',
'parseinline' ) );
}
+ # Give a notice if the user is uploading a file that has been
deleted or moved
+ # Note that this is independent from the message
'filewasdeleted' that requires JS
+ $desiredTitleObj = Title::newFromText( $this->mDesiredDestName,
NS_FILE );
+ $delNotice = ''; // empty by default
+ if ( !$desiredTitleObj->exists() ) {
+ LogEventsList::showLogExtract( &$delNotice, array(
'delete', 'move' ),
+ $desiredTitleObj->getPrefixedText(),
+ '', array( 'lim' => 10,
+ 'conds' => array( "log_action !=
'revision'" ),
+ 'showIfEmpty' => false,
+ 'msgKey' => array(
'upload-recreate-warning' ) )
+ );
+ }
+ $form->addPreText( $delNotice );
+
# Add text to form
$form->addPreText( '<div id="uploadtext">' .
wfMsgExt( 'uploadtext', 'parse', array(
$this->mDesiredDestName ) ) .
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2010-04-20 19:10:13 UTC
(rev 65338)
+++ trunk/phase3/languages/messages/MessagesEn.php 2010-04-20 20:30:11 UTC
(rev 65339)
@@ -2019,6 +2019,9 @@
'upload_directory_read_only' => 'The upload directory ($1) is not writable by
the webserver.',
'uploaderror' => 'Upload error',
'upload-summary' => '', # do not translate or duplicate this
message to other languages
+'upload-recreate-warning' => "'''Warning: A file by that name has been
deleted or moved.'''
+
+The deletion and move log for this page are provided here for convenience:",
'uploadtext' => "Use the form below to upload files.
To view or search previously uploaded files go to the [[Special:FileList|list
of uploaded files]], (re)uploads are also logged in the
[[Special:Log/upload|upload log]], deletions in the
[[Special:Log/delete|deletion log]].
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
