Revision: 43677
Author: catrope
Date: 2008-11-18 15:21:04 +0000 (Tue, 18 Nov 2008)
Log Message:
-----------
API: Make reblocking (introduced in r42843) possible through the API
* Add reblock parameter to action=block
* Tweak the description for allowusertalk for consistency
Modified Paths:
--------------
trunk/phase3/includes/api/ApiBlock.php
Modified: trunk/phase3/includes/api/ApiBlock.php
===================================================================
--- trunk/phase3/includes/api/ApiBlock.php 2008-11-18 15:11:11 UTC (rev
43676)
+++ trunk/phase3/includes/api/ApiBlock.php 2008-11-18 15:21:04 UTC (rev
43677)
@@ -85,6 +85,7 @@
$form->BlockEmail = $params['noemail'];
$form->BlockHideName = $params['hidename'];
$form->BlockAllowUsertalk = $params['allowusertalk'] &&
$wgBlockAllowsUTEdit;
+ $form->BlockReblock = $params['reblock'];
$userID = $expiry = null;
$retval = $form->doBlock($userID, $expiry);
@@ -127,6 +128,7 @@
'noemail' => false,
'hidename' => false,
'allowusertalk' => false,
+ 'reblock' => false,
);
}
@@ -142,7 +144,8 @@
'autoblock' => 'Automatically block the last used IP
address, and any subsequent IP addresses they try to login from',
'noemail' => 'Prevent user from sending e-mail through
the wiki. (Requires the "blockemail" right.)',
'hidename' => 'Hide the username from the block log.
(Requires the "hideuser" right.)',
- 'allowusertalk' => 'Whether to allow the user to edit
their own talk page (Dependent on $wgBlockAllowsUTEdit)'
+ 'allowusertalk' => 'Allow the user to edit their own
talk page (depends on $wgBlockAllowsUTEdit)',
+ 'reblock' => 'If the user is already blocked, overwrite
the existing block',
);
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
