/// @var Bool
protected $alreadyBlocked;
-
+
/// @var Array
protected $preErrors = array();
if( $type == Block::TYPE_USER ){
# TODO: why do we not have a User->exists() method?
if( !$target->getId() ){
- return wfMessage( 'nosuchusershort', $target->getName() );
+ return wfMessage( 'nosuchusershort',
+ wfEscapeWikiText( $target->getName() ) );
}
$status = self::checkUnblockSelf( $target );
# Give admins a heads-up before they go and block themselves. Much messier
# to do this for IPs, but it's pretty unlikely they'd ever get the 'block'
# permission anyway, although the code does allow for it
- if( $target === $wgUser->getName() && ( $data['PreviousTarget'] != $data['Target'] || !$data['Confirm'] ) )
+ if( $target === $wgUser->getName() &&
+ ( $data['PreviousTarget'] != $data['Target'] || !$data['Confirm'] ) )
{
return array( 'ipb-blockingself' );
}
$status = $block->insert();
if( !$status ) {
# Show form unless the user is already aware of this...
- if( ( $data['PreviousTarget'] != htmlspecialchars( $block->getTarget() ) ) || !$data['Confirm'] ) {
+ if( !$data['Confirm'] || ( array_key_exists( 'PreviousTarget', $data )
+ && $data['PreviousTarget'] !== htmlspecialchars( $block->getTarget() ) ) )
+ {
return array( array( 'ipb_already_blocked', $block->getTarget() ) );
# Otherwise, try to update the block...
} else {
/**
* Get an array of suggested block durations from MediaWiki:Ipboptions
- * FIXME: this uses a rather odd syntax for the options, should it be converted
+ * @todo FIXME: This uses a rather odd syntax for the options, should it be converted
* to the standard "**<duration>|<displayname>" format?
* @return Array
*/
public static function parseExpiryInput( $expiry ) {
static $infinity;
if( $infinity == null ){
- $infinity = wfGetDB( DB_READ )->getInfinity();
+ $infinity = wfGetDB( DB_SLAVE )->getInfinity();
}
if ( $expiry == 'infinite' || $expiry == 'indefinite' ) {
$expiry = $infinity;
$flags[] = 'noemail';
}
- if( $data['DisableUTEdit'] && $wgBlockAllowsUTEdit ){
+ if( $wgBlockAllowsUTEdit && $data['DisableUTEdit'] ){
$flags[] = 'nousertalk';
}