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
Creating new WMF 1.30.0-wmf.17 branch
[lhc/web/wiklou.git]
/
includes
/
specials
/
pagers
/
DeletedContribsPager.php
diff --git
a/includes/specials/pagers/DeletedContribsPager.php
b/includes/specials/pagers/DeletedContribsPager.php
index
43d7ad4
..
38a332e
100644
(file)
--- a/
includes/specials/pagers/DeletedContribsPager.php
+++ b/
includes/specials/pagers/DeletedContribsPager.php
@@
-69,14
+69,17
@@
class DeletedContribsPager extends IndexPager {
' != ' . Revision::SUPPRESSED_USER;
}
' != ' . Revision::SUPPRESSED_USER;
}
+ $commentQuery = CommentStore::newKey( 'ar_comment' )->getJoin();
+
return [
return [
- 'tables' => [ 'archive' ],
+ 'tables' => [ 'archive' ]
+ $commentQuery['tables']
,
'fields' => [
'fields' => [
- 'ar_rev_id', 'ar_namespace', 'ar_title', 'ar_timestamp',
'ar_comment',
+ 'ar_rev_id', 'ar_namespace', 'ar_title', 'ar_timestamp',
'ar_minor_edit', 'ar_user', 'ar_user_text', 'ar_deleted'
'ar_minor_edit', 'ar_user', 'ar_user_text', 'ar_deleted'
- ],
+ ]
+ $commentQuery['fields']
,
'conds' => $conds,
'conds' => $conds,
- 'options' => [ 'USE INDEX' => $index ]
+ 'options' => [ 'USE INDEX' => [ 'archive' => $index ] ],
+ 'join_conds' => $commentQuery['joins'],
];
}
];
}
@@
-253,7
+256,7
@@
class DeletedContribsPager extends IndexPager {
$rev = new Revision( [
'title' => $page,
'id' => $row->ar_rev_id,
$rev = new Revision( [
'title' => $page,
'id' => $row->ar_rev_id,
- 'comment' =>
$row->ar_commen
t,
+ 'comment' =>
CommentStore::newKey( 'ar_comment' )->getComment( $row )->tex
t,
'user' => $row->ar_user,
'user_text' => $row->ar_user_text,
'timestamp' => $row->ar_timestamp,
'user' => $row->ar_user,
'user_text' => $row->ar_user_text,
'timestamp' => $row->ar_timestamp,