(bug 9575) Accept upload description from GET parameters

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d248b1e..877b57d 100644 (file)
--- 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 0c66e93..0affae1 100644 (file)
--- 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' );