From 1eb5b0257d7320278c7a657d0c5dd7ce1b3e49d4 Mon Sep 17 00:00:00 2001 From: Bryan Tong Minh Date: Fri, 18 Jun 2010 20:09:20 +0000 Subject: [PATCH] (bug 23465) Don't ignore the predefined destination filename on Special:Upload after following a red link --- RELEASE-NOTES | 2 ++ includes/specials/SpecialUpload.php | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 763e3ed23d..965f800ae9 100644 --- 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 dee0301663..3307064b34 100644 --- 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, ); -- 2.20.1