dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Selenium: replace UserLoginPage with BlankPage where possible"
[lhc/web/wiklou.git]
/
includes
/
specials
/
pagers
/
BlockListPager.php
diff --git
a/includes/specials/pagers/BlockListPager.php
b/includes/specials/pagers/BlockListPager.php
index
a2dbb72
..
01aed22
100644
(file)
--- a/
includes/specials/pagers/BlockListPager.php
+++ b/
includes/specials/pagers/BlockListPager.php
@@
-22,6
+22,7
@@
/**
* @ingroup Pager
*/
/**
* @ingroup Pager
*/
+use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Block\Restriction\Restriction;
use MediaWiki\Block\Restriction\PageRestriction;
use MediaWiki\Block\Restriction\NamespaceRestriction;
use MediaWiki\Block\Restriction\Restriction;
use MediaWiki\Block\Restriction\PageRestriction;
use MediaWiki\Block\Restriction\NamespaceRestriction;
@@
-107,10
+108,10
@@
class BlockListPager extends TablePager {
if ( $row->ipb_auto ) {
$formatted = $this->msg( 'autoblockid', $row->ipb_id )->parse();
} else {
if ( $row->ipb_auto ) {
$formatted = $this->msg( 'autoblockid', $row->ipb_id )->parse();
} else {
- list( $target, $type ) = Block::parseTarget( $row->ipb_address );
+ list( $target, $type ) =
Database
Block::parseTarget( $row->ipb_address );
switch ( $type ) {
switch ( $type ) {
- case Block::TYPE_USER:
- case Block::TYPE_IP:
+ case
Database
Block::TYPE_USER:
+ case
Database
Block::TYPE_IP:
$formatted = Linker::userLink( $target->getId(), $target );
$formatted .= Linker::userToolLinks(
$target->getId(),
$formatted = Linker::userLink( $target->getId(), $target );
$formatted .= Linker::userToolLinks(
$target->getId(),
@@
-119,7
+120,7
@@
class BlockListPager extends TablePager {
Linker::TOOL_LINKS_NOBLOCK
);
break;
Linker::TOOL_LINKS_NOBLOCK
);
break;
- case Block::TYPE_RANGE:
+ case
Database
Block::TYPE_RANGE:
$formatted = htmlspecialchars( $target );
}
}
$formatted = htmlspecialchars( $target );
}
}
@@
-364,7
+365,7
@@
class BlockListPager extends TablePager {
function getTotalAutoblocks() {
$dbr = $this->getDatabase();
$res = $dbr->selectField( 'ipblocks',
function getTotalAutoblocks() {
$dbr = $this->getDatabase();
$res = $dbr->selectField( 'ipblocks',
-
[ 'COUNT(*) AS totalautoblocks' ]
,
+
'COUNT(*)'
,
[
'ipb_auto' => '1',
'ipb_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() ),
[
'ipb_auto' => '1',
'ipb_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() ),