Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(bug 32827) "[Regression] Block log for IP ranges not shown on Special:Block"

Browse source 
(imported from SVN)

Change-Id: I16485d84553256ff6ad4932de7d17540e90af779
This commit is contained in:
Aaron Schulz 2012-03-14 01:42:14 +00:00 committed by Catrope
parent 223640722a
commit 8441c854aa
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
includes/specials/SpecialBlock.php
View file

@ -381,19 +381,19 @@ class SpecialBlock extends FormSpecialPage {
$this->getLanguage()->pipeList( $links )
);
if( $this->target instanceof User ){
$userTitle = self::getTargetUserTitle( $this->target );
if( $userTitle ){
# Get relevant extracts from the block and suppression logs, if possible
$userpage = $this->target->getUserPage();
$out = '';
LogEventsList::showLogExtract(
$out,
'block',
$userpage,
$userTitle,
'',
array(
'lim' => 10,
'msgKey' => array( 'blocklog-showlog', $userpage->getText() ),
'msgKey' => array( 'blocklog-showlog', $userTitle->getText() ),
'showIfEmpty' => false
)
);
@ -404,12 +404,12 @@ class SpecialBlock extends FormSpecialPage {
LogEventsList::showLogExtract(
$out,
'suppress',
$userpage,
$userTitle,
'',
array(
'lim' => 10,
'conds' => array( 'log_action' => array( 'block', 'reblock', 'unblock' ) ),
'msgKey' => array( 'blocklog-showsuppresslog', $userpage->getText() ),
'msgKey' => array( 'blocklog-showsuppresslog', $userTitle->getText() ),
'showIfEmpty' => false
)
);
@ -421,6 +421,21 @@ class SpecialBlock extends FormSpecialPage {
return $text;
}
/**
* Get a user page target for things like logs.
* This handles account and IP range targets.
* @param $target User|string
* @return Title|null
*/
protected static function getTargetUserTitle( $target ) {
if( $target instanceof User ) {
return $target->getUserPage();
} elseif ( IP::isIPAddress( $target ) ) {
return Title::makeTitleSafe( NS_USER, $target );
}
return null;
}
/**
* Determine the target of the block, and the type of target
* TODO: should be in Block.php?