| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -1751,7 +1751,7 @@ |
| 1752 | 1752 | 'protectexpiry', |
| 1753 | 1753 | 'protect_expiry_invalid', |
| 1754 | 1754 | 'protect_expiry_old', |
| 1755 | | - 'protect-unchain', |
| | 1755 | + 'protect-unchain-permissions', |
| 1756 | 1756 | 'protect-text', |
| 1757 | 1757 | 'protect-locked-blocked', |
| 1758 | 1758 | 'protect-locked-dblock', |
| Index: trunk/phase3/skins/common/protect.js |
| — | — | @@ -22,7 +22,7 @@ |
| 23 | 23 | |
| 24 | 24 | var boxbody = box.getElementsByTagName('tbody')[0] |
| 25 | 25 | var row = document.createElement( 'tr' ); |
| 26 | | - boxbody.insertBefore( row, boxbody.firstChild ); |
| | 26 | + boxbody.insertBefore( row, boxbody.firstChild.nextSibling ); |
| 27 | 27 | |
| 28 | 28 | this.existingMatch = opts.existingMatch; |
| 29 | 29 | |
| Index: trunk/phase3/includes/ProtectionForm.php |
| — | — | @@ -318,6 +318,10 @@ |
| 319 | 319 | Xml::openElement( 'tbody' ); |
| 320 | 320 | |
| 321 | 321 | foreach( $this->mRestrictions as $action => $selected ) { |
| | 322 | + // Special case: apply upload protection only on images |
| | 323 | + if ( $action == 'upload' && $this->mTitle->getNamespace() != NS_FILE ) |
| | 324 | + continue; |
| | 325 | + |
| 322 | 326 | /* Not all languages have V_x <-> N_x relation */ |
| 323 | 327 | $msg = wfMsg( 'restriction-' . $action ); |
| 324 | 328 | if( wfEmptyMsg( 'restriction-' . $action, $msg ) ) { |
| — | — | @@ -547,8 +551,8 @@ |
| 548 | 552 | } |
| 549 | 553 | $script .= "[" . implode(',',$CascadeableLevels) . "];\n"; |
| 550 | 554 | $options = (object)array( |
| 551 | | - 'tableId' => 'mw-protect-table-move', |
| 552 | | - 'labelText' => wfMsg( 'protect-unchain' ), |
| | 555 | + 'tableId' => 'mwProtectSet', |
| | 556 | + 'labelText' => wfMsg( 'protect-unchain-permissions' ), |
| 553 | 557 | 'numTypes' => count($this->mApplicableTypes), |
| 554 | 558 | 'existingMatch' => 1 == count( array_unique( $this->mExistingExpiry ) ), |
| 555 | 559 | ); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1452,7 +1452,7 @@ |
| 1453 | 1453 | * You probably shouldn't change this. |
| 1454 | 1454 | * Translated through restriction-* messages. |
| 1455 | 1455 | */ |
| 1456 | | -$wgRestrictionTypes = array( 'edit', 'move' ); |
| | 1456 | +$wgRestrictionTypes = array( 'edit', 'move', 'upload' ); |
| 1457 | 1457 | |
| 1458 | 1458 | /** |
| 1459 | 1459 | * Rights which can be required for each protection level (via action=protect) |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -96,6 +96,7 @@ |
| 97 | 97 | * $wgEnableHtmlDiff has been removed |
| 98 | 98 | * (bug 3340) $wgBlockCIDRLimit added (default: 16) to configure the low end of |
| 99 | 99 | CIDR ranges for blocking |
| | 100 | +* Added upload by default to $wgRestrictionTypes |
| 100 | 101 | |
| 101 | 102 | === New features in 1.16 === |
| 102 | 103 | |
| — | — | @@ -617,6 +618,7 @@ |
| 618 | 619 | * (bug 19859) Removed experimental HTMLDiff feature |
| 619 | 620 | * Removed section edit links in edit conflict form |
| 620 | 621 | * Allow SpecialActiveusers to work on non-MySQL databases |
| | 622 | +* (bug 6579) Fixed protecting images from uploading only |
| 621 | 623 | |
| 622 | 624 | == API changes in 1.16 == |
| 623 | 625 | |