X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fspecials%2Fpagers%2FProtectedPagesPager.php;h=3b69698fe70488f714ac643796f757a2a6a4459a;hb=27c61fb1e94da9114314468fd00bcf129ec064b6;hp=c4ea5f858e4c4506207824d119e7485d656f81af;hpb=0c712ce564e0bd53e28f2581a714ee8cd04b614c;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/specials/pagers/ProtectedPagesPager.php b/includes/specials/pagers/ProtectedPagesPager.php index c4ea5f858e..3b69698fe7 100644 --- a/includes/specials/pagers/ProtectedPagesPager.php +++ b/includes/specials/pagers/ProtectedPagesPager.php @@ -284,9 +284,13 @@ class ProtectedPagesPager extends TablePager { } $commentQuery = CommentStore::getStore()->getJoin( 'log_comment' ); + $actorQuery = ActorMigration::newMigration()->getJoin( 'log_user' ); return [ - 'tables' => [ 'page', 'page_restrictions', 'log_search', 'logging' ] + $commentQuery['tables'], + 'tables' => [ + 'page', 'page_restrictions', 'log_search', + 'logparen' => [ 'logging' ] + $commentQuery['tables'] + $actorQuery['tables'], + ], 'fields' => [ 'pr_id', 'page_namespace', @@ -297,9 +301,8 @@ class ProtectedPagesPager extends TablePager { 'pr_expiry', 'pr_cascade', 'log_timestamp', - 'log_user', 'log_deleted', - ] + $commentQuery['fields'], + ] + $commentQuery['fields'] + $actorQuery['fields'], 'conds' => $conds, 'join_conds' => [ 'log_search' => [ @@ -307,12 +310,12 @@ class ProtectedPagesPager extends TablePager { 'ls_field' => 'pr_id', 'ls_value = ' . $this->mDb->buildStringCast( 'pr_id' ) ] ], - 'logging' => [ + 'logparen' => [ 'LEFT JOIN', [ 'ls_log_id = log_id' ] ] - ] + $commentQuery['joins'] + ] + $commentQuery['joins'] + $actorQuery['joins'] ]; }