| Index: trunk/phase3/includes/api/ApiBlock.php |
| — | — | @@ -85,6 +85,7 @@ |
| 86 | 86 | $form->BlockEmail = $params['noemail']; |
| 87 | 87 | $form->BlockHideName = $params['hidename']; |
| 88 | 88 | $form->BlockAllowUsertalk = $params['allowusertalk'] && $wgBlockAllowsUTEdit; |
| | 89 | + $form->BlockReblock = $params['reblock']; |
| 89 | 90 | |
| 90 | 91 | $userID = $expiry = null; |
| 91 | 92 | $retval = $form->doBlock($userID, $expiry); |
| — | — | @@ -127,6 +128,7 @@ |
| 128 | 129 | 'noemail' => false, |
| 129 | 130 | 'hidename' => false, |
| 130 | 131 | 'allowusertalk' => false, |
| | 132 | + 'reblock' => false, |
| 131 | 133 | ); |
| 132 | 134 | } |
| 133 | 135 | |
| — | — | @@ -142,7 +144,8 @@ |
| 143 | 145 | 'autoblock' => 'Automatically block the last used IP address, and any subsequent IP addresses they try to login from', |
| 144 | 146 | 'noemail' => 'Prevent user from sending e-mail through the wiki. (Requires the "blockemail" right.)', |
| 145 | 147 | 'hidename' => 'Hide the username from the block log. (Requires the "hideuser" right.)', |
| 146 | | - 'allowusertalk' => 'Whether to allow the user to edit their own talk page (Dependent on $wgBlockAllowsUTEdit)' |
| | 148 | + 'allowusertalk' => 'Allow the user to edit their own talk page (depends on $wgBlockAllowsUTEdit)', |
| | 149 | + 'reblock' => 'If the user is already blocked, overwrite the existing block', |
| 147 | 150 | ); |
| 148 | 151 | } |
| 149 | 152 | |