From: Rob Church <robchurch@users.mediawiki.org>
Date: Sun, 22 Jul 2007 23:25:26 +0000 (+0000)
Subject: (bug 9575) Accept upload description from GET parameters
X-Git-Tag: 1.31.0-rc.0~51989
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_aide%28?a=commitdiff_plain;h=16ed0301cdf7443b79d93e5005b81b9934e58eb8;p=lhc%2Fweb%2Fwiklou.git

(bug 9575) Accept upload description from GET parameters
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d248b1e4f5..877b57d86d 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -155,6 +155,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Introduce 'UserGetRights' hook; see docs/hooks.txt for more information
 * Pass new Revision to the 'ArticleInsertComplete' and 'ArticleSaveComplete'
   hooks; see docs/hooks.txt for more information
+* (bug 9575) Accept upload description from GET parameters
 
 == Bugfixes since 1.10 ==
 
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 0c66e93482..0affae1bc9 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -46,9 +46,11 @@ class UploadForm {
 		global $wgAllowCopyUploads;
 		$this->mDesiredDestName   = $request->getText( 'wpDestFile' );
 		$this->mIgnoreWarning     = $request->getCheck( 'wpIgnoreWarning' );
+		$this->mComment           = $request->getText( 'wpUploadDescription' );
 
 		if( !$request->wasPosted() ) {
-			# GET requests just give the main form; no data except wpDestfile.
+			# GET requests just give the main form; no data except destination
+			# filename and description
 			return;
 		}
 
@@ -59,7 +61,6 @@ class UploadForm {
 		$this->mReUpload          = $request->getCheck( 'wpReUpload' );
 		$this->mUploadClicked     = $request->getCheck( 'wpUpload' );
 
-		$this->mComment           = $request->getText( 'wpUploadDescription' );
 		$this->mLicense           = $request->getText( 'wpLicense' );
 		$this->mCopyrightStatus   = $request->getText( 'wpUploadCopyStatus' );
 		$this->mCopyrightSource   = $request->getText( 'wpUploadSource' );