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 "Create update SPARQL for category changes"
[lhc/web/wiklou.git]
/
includes
/
specials
/
pagers
/
BlockListPager.php
diff --git
a/includes/specials/pagers/BlockListPager.php
b/includes/specials/pagers/BlockListPager.php
index
fe7cac0
..
5789c28
100644
(file)
--- a/
includes/specials/pagers/BlockListPager.php
+++ b/
includes/specials/pagers/BlockListPager.php
@@
-23,7
+23,7
@@
* @ingroup Pager
*/
use MediaWiki\MediaWikiServices;
* @ingroup Pager
*/
use MediaWiki\MediaWikiServices;
-use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\
I
ResultWrapper;
class BlockListPager extends TablePager {
class BlockListPager extends TablePager {
@@
-210,15
+210,16
@@
class BlockListPager extends TablePager {
function getQueryInfo() {
$commentQuery = CommentStore::getStore()->getJoin( 'ipb_reason' );
function getQueryInfo() {
$commentQuery = CommentStore::getStore()->getJoin( 'ipb_reason' );
+ $actorQuery = ActorMigration::newMigration()->getJoin( 'ipb_by' );
$info = [
$info = [
- 'tables' => [ 'ipblocks', 'user' ] + $commentQuery['tables'],
+ 'tables' => array_merge(
+ [ 'ipblocks' ], $commentQuery['tables'], $actorQuery['tables'], [ 'user' ]
+ ),
'fields' => [
'ipb_id',
'ipb_address',
'ipb_user',
'fields' => [
'ipb_id',
'ipb_address',
'ipb_user',
- 'ipb_by',
- 'ipb_by_text',
'by_user_name' => 'user_name',
'ipb_timestamp',
'ipb_auto',
'by_user_name' => 'user_name',
'ipb_timestamp',
'ipb_auto',
@@
-231,9
+232,11
@@
class BlockListPager extends TablePager {
'ipb_deleted',
'ipb_block_email',
'ipb_allow_usertalk',
'ipb_deleted',
'ipb_block_email',
'ipb_allow_usertalk',
- ] + $commentQuery['fields'],
+ ] + $commentQuery['fields']
+ $actorQuery['fields']
,
'conds' => $this->conds,
'conds' => $this->conds,
- 'join_conds' => [ 'user' => [ 'LEFT JOIN', 'user_id = ipb_by' ] ] + $commentQuery['joins']
+ 'join_conds' => [
+ 'user' => [ 'LEFT JOIN', 'user_id = ' . $actorQuery['fields']['ipb_by'] ]
+ ] + $commentQuery['joins'] + $actorQuery['joins']
];
# Filter out any expired blocks
];
# Filter out any expired blocks
@@
-286,7
+289,7
@@
class BlockListPager extends TablePager {
/**
* Do a LinkBatch query to minimise database load when generating all these links
/**
* Do a LinkBatch query to minimise database load when generating all these links
- * @param ResultWrapper $result
+ * @param
I
ResultWrapper $result
*/
function preprocessResults( $result ) {
# Do a link batch query
*/
function preprocessResults( $result ) {
# Do a link batch query