r42651 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r42650‎ | r42651 | r42652 >
Date:12:06, 27 October 2008
Author:catrope
Status:old
Tags:
Comment:
API: Per IRC conversation with Splarka, add a few words about token availability from prop=info in the help text for action=block and action=unblock
Modified paths:
  • /trunk/phase3/includes/api/ApiBlock.php (modified) (history)
  • /trunk/phase3/includes/api/ApiUnblock.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/api/ApiUnblock.php
@@ -94,7 +94,7 @@
9595 return array (
9696 'id' => 'ID of the block you want to unblock (obtained through list=blocks). Cannot be used together with user',
9797 'user' => 'Username, IP address or IP range you want to unblock. Cannot be used together with id',
98 - 'token' => 'An unblock token previously obtained through the gettoken parameter',
 98+ 'token' => 'An unblock token previously obtained through the gettoken parameter or prop=info',
9999 'gettoken' => 'If set, an unblock token will be returned, and no other action will be taken',
100100 'reason' => 'Reason for unblock (optional)',
101101 );
Index: trunk/phase3/includes/api/ApiBlock.php
@@ -133,7 +133,7 @@
134134 public function getParamDescription() {
135135 return array (
136136 'user' => 'Username, IP address or IP range you want to block',
137 - 'token' => 'A block token previously obtained through the gettoken parameter',
 137+ 'token' => 'A block token previously obtained through the gettoken parameter or prop=info',
138138 'gettoken' => 'If set, a block token will be returned, and no other action will be taken',
139139 'expiry' => 'Relative expiry time, e.g. \'5 months\' or \'2 weeks\'. If set to \'infinite\', \'indefinite\' or \'never\', the block will never expire.',
140140 'reason' => 'Reason for block (optional)',

Status & tagging log