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 "Fix sessionfailure i18n message during authentication"
[lhc/web/wiklou.git]
/
includes
/
specials
/
pagers
/
BlockListPager.php
diff --git
a/includes/specials/pagers/BlockListPager.php
b/includes/specials/pagers/BlockListPager.php
index
51e446d
..
fe7cac0
100644
(file)
--- a/
includes/specials/pagers/BlockListPager.php
+++ b/
includes/specials/pagers/BlockListPager.php
@@
-79,7
+79,7
@@
class BlockListPager extends TablePager {
}
}
}
}
- /** @var
$row object
*/
+ /** @var
object $row
*/
$row = $this->mCurrentRow;
$language = $this->getLanguage();
$row = $this->mCurrentRow;
$language = $this->getLanguage();
@@
-173,6
+173,7
@@
class BlockListPager extends TablePager {
break;
case 'ipb_reason':
break;
case 'ipb_reason':
+ $value = CommentStore::getStore()->getComment( 'ipb_reason', $row )->text;
$formatted = Linker::formatComment( $value );
break;
$formatted = Linker::formatComment( $value );
break;
@@
-208,8
+209,10
@@
class BlockListPager extends TablePager {
}
function getQueryInfo() {
}
function getQueryInfo() {
+ $commentQuery = CommentStore::getStore()->getJoin( 'ipb_reason' );
+
$info = [
$info = [
- 'tables' => [ 'ipblocks', 'user' ],
+ 'tables' => [ 'ipblocks', 'user' ]
+ $commentQuery['tables']
,
'fields' => [
'ipb_id',
'ipb_address',
'fields' => [
'ipb_id',
'ipb_address',
@@
-217,7
+220,6
@@
class BlockListPager extends TablePager {
'ipb_by',
'ipb_by_text',
'by_user_name' => 'user_name',
'ipb_by',
'ipb_by_text',
'by_user_name' => 'user_name',
- 'ipb_reason',
'ipb_timestamp',
'ipb_auto',
'ipb_anon_only',
'ipb_timestamp',
'ipb_auto',
'ipb_anon_only',
@@
-229,9
+231,9
@@
class BlockListPager extends TablePager {
'ipb_deleted',
'ipb_block_email',
'ipb_allow_usertalk',
'ipb_deleted',
'ipb_block_email',
'ipb_allow_usertalk',
- ],
+ ]
+ $commentQuery['fields']
,
'conds' => $this->conds,
'conds' => $this->conds,
- 'join_conds' => [ 'user' => [ 'LEFT JOIN', 'user_id = ipb_by' ] ]
+ 'join_conds' => [ 'user' => [ 'LEFT JOIN', 'user_id = ipb_by' ] ]
+ $commentQuery['joins']
];
# Filter out any expired blocks
];
# Filter out any expired blocks