X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2Fpagers%2FActiveUsersPager.php;h=87c849aab2311ba80009d0a216d8df007068ad23;hb=3e83cc276aa498fbf5786a1f9bdd6285fa03cdc9;hp=64af71a16ae26a8aee2f63344002bc2d0390ac2d;hpb=079d61fb79ac0a026c5a4c3b57bfbdaf3a037cd1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/pagers/ActiveUsersPager.php b/includes/specials/pagers/ActiveUsersPager.php
index 64af71a16a..87c849aab2 100644
--- a/includes/specials/pagers/ActiveUsersPager.php
+++ b/includes/specials/pagers/ActiveUsersPager.php
@@ -44,7 +44,7 @@ class ActiveUsersPager extends UsersPager {
 	private $blockStatusByUid;
 
 	/**
-	 * @param IContextSource $context
+	 * @param IContextSource|null $context
 	 * @param FormOptions $opts
 	 */
 	function __construct( IContextSource $context = null, FormOptions $opts ) {
@@ -79,14 +79,17 @@ class ActiveUsersPager extends UsersPager {
 	function getQueryInfo() {
 		$dbr = $this->getDatabase();
 
+		$rcQuery = ActorMigration::newMigration()->getJoin( 'rc_user' );
+
 		$activeUserSeconds = $this->getConfig()->get( 'ActiveUserDays' ) * 86400;
 		$timestamp = $dbr->timestamp( wfTimestamp( TS_UNIX ) - $activeUserSeconds );
-		$tables = [ 'querycachetwo', 'user', 'recentchanges' ];
+		$tables = [ 'querycachetwo', 'user', 'recentchanges' ] + $rcQuery['tables'];
+		$jconds = $rcQuery['joins'];
 		$conds = [
 			'qcc_type' => 'activeusers',
 			'qcc_namespace' => NS_USER,
 			'user_name = qcc_title',
-			'rc_user_text = qcc_title',
+			$rcQuery['fields']['rc_user_text'] . ' = qcc_title',
 			'rc_type != ' . $dbr->addQuotes( RC_EXTERNAL ), // Don't count wikidata.
 			'rc_type != ' . $dbr->addQuotes( RC_CATEGORIZE ), // Don't count categorization changes.
 			'rc_log_type IS NULL OR rc_log_type != ' . $dbr->addQuotes( 'newusers' ),
@@ -127,7 +130,8 @@ class ActiveUsersPager extends UsersPager {
 				'recentedits' => 'COUNT(*)'
 			],
 			'options' => [ 'GROUP BY' => [ 'qcc_title' ] ],
-			'conds' => $conds
+			'conds' => $conds,
+			'join_conds' => $jconds,
 		];
 	}