(bug 23465) Don't ignore the predefined destination filename on Special:Upload...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 763e3ed..965f800 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -200,6 +200,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 16356) Repair dumpInterwiki.inc to use proper normalization.
 * (bug 24006) deleteArchivedRevisions.php maintenance script now longer throws
   a fatal error
+* (bug 23465) Don't ignore the predefined destination filename on 
+  Special:Upload after following a red link
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index dee0301..3307064 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -1035,7 +1035,10 @@ class UploadForm extends HTMLForm {
                $scriptVars = array(
                        'wgAjaxUploadDestCheck' => $useAjaxDestCheck,
                        'wgAjaxLicensePreview' => $useAjaxLicensePreview,
-                       'wgUploadAutoFill' => !$this->mForReUpload,
+                       'wgUploadAutoFill' => !$this->mForReUpload &&
+                               // If we received mDestFile from the request, don't autofill
+                               // the wpDestFile textbox
+                               $this->mDestFile === '',
                        'wgUploadSourceIds' => $this->mSourceIds,
                );