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 "Expand special page aliases for Serbian"
[lhc/web/wiklou.git]
/
includes
/
revisiondelete
/
RevDelLogList.php
diff --git
a/includes/revisiondelete/RevDelLogList.php
b/includes/revisiondelete/RevDelLogList.php
index
ceb97e4
..
b26fffd
100644
(file)
--- a/
includes/revisiondelete/RevDelLogList.php
+++ b/
includes/revisiondelete/RevDelLogList.php
@@
-63,27
+63,26
@@
class RevDelLogList extends RevDelList {
public function doQuery( $db ) {
$ids = array_map( 'intval', $this->ids );
public function doQuery( $db ) {
$ids = array_map( 'intval', $this->ids );
- $commentQuery = CommentStore::getKey( 'log_comment' )->getJoin();
+ $commentQuery = CommentStore::getStore()->getJoin( 'log_comment' );
+ $actorQuery = ActorMigration::newMigration()->getJoin( 'log_user' );
return $db->select(
return $db->select(
- [ 'logging' ] + $commentQuery['tables'],
+ [ 'logging' ] + $commentQuery['tables']
+ $actorQuery['tables']
,
[
'log_id',
'log_type',
'log_action',
'log_timestamp',
[
'log_id',
'log_type',
'log_action',
'log_timestamp',
- 'log_user',
- 'log_user_text',
'log_namespace',
'log_title',
'log_page',
'log_params',
'log_deleted'
'log_namespace',
'log_title',
'log_page',
'log_params',
'log_deleted'
- ] + $commentQuery['fields'],
+ ] + $commentQuery['fields']
+ $actorQuery['fields']
,
[ 'log_id' => $ids ],
__METHOD__,
[ 'ORDER BY' => 'log_id DESC' ],
[ 'log_id' => $ids ],
__METHOD__,
[ 'ORDER BY' => 'log_id DESC' ],
- $commentQuery['joins']
+ $commentQuery['joins']
+ $actorQuery['joins']
);
}
);
}