Do not add the license selector when uploading a new version of a file

When using "upload a new version", the information in the license field is ignored during submit.
The field has no use in this mode because the information is only added in the filelog, not on
the filepage. As such we should just not add it at all when uploading a new version.

This closes bug 23241.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 87eb101..c338b65 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -146,6 +146,8 @@ in a negative namespace (which is invalid).
   are now checked when loading Special:Upload. Toolbar link for Special:Upload
   is no longer shown if the user does not have the required permissions.
 * (Bug 23397) texvc in html mode renders \sim as ˜ not ∼
+* (Bug 23241) Remove License selector, because it is not used when uploading a
+  new version.
 
 === 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 6a54294..154f4a6 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -925,17 +925,19 @@ class UploadForm extends HTMLForm {
                        'EditTools' => array(
                                'type' => 'edittools',
                                'section' => 'description',
-                       ),
-                       'License' => array(
+                       )
+               );
+
+               if ( $this->mForReUpload ) {
+                       $descriptor['DestFile']['readonly'] = true;
+               } else {
+                       $descriptor['License'] = array(
                                'type' => 'select',
                                'class' => 'Licenses',
                                'section' => 'description',
                                'id' => 'wpLicense',
                                'label-message' => 'license',
-                       ),
-               );
-               if ( $this->mForReUpload ) {
-                       $descriptor['DestFile']['readonly'] = true;
+                       );
                }
 
                global $wgUseCopyrightUpload;