| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -925,17 +925,19 @@ |
| 926 | 926 | 'EditTools' => array( |
| 927 | 927 | 'type' => 'edittools', |
| 928 | 928 | 'section' => 'description', |
| 929 | | - ), |
| 930 | | - 'License' => array( |
| | 929 | + ) |
| | 930 | + ); |
| | 931 | + |
| | 932 | + if ( $this->mForReUpload ) { |
| | 933 | + $descriptor['DestFile']['readonly'] = true; |
| | 934 | + } else { |
| | 935 | + $descriptor['License'] = array( |
| 931 | 936 | 'type' => 'select', |
| 932 | 937 | 'class' => 'Licenses', |
| 933 | 938 | 'section' => 'description', |
| 934 | 939 | 'id' => 'wpLicense', |
| 935 | 940 | 'label-message' => 'license', |
| 936 | | - ), |
| 937 | | - ); |
| 938 | | - if ( $this->mForReUpload ) { |
| 939 | | - $descriptor['DestFile']['readonly'] = true; |
| | 941 | + ); |
| 940 | 942 | } |
| 941 | 943 | |
| 942 | 944 | global $wgUseCopyrightUpload; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -146,6 +146,8 @@ |
| 147 | 147 | are now checked when loading Special:Upload. Toolbar link for Special:Upload |
| 148 | 148 | is no longer shown if the user does not have the required permissions. |
| 149 | 149 | * (Bug 23397) texvc in html mode renders \sim as ˜ not ∼ |
| | 150 | +* (Bug 23241) Remove License selector, because it is not used when uploading a |
| | 151 | + new version. |
| 150 | 152 | |
| 151 | 153 | === API changes in 1.17 === |
| 152 | 154 | * (bug 22738) Allow filtering by action type on query=logevent |