From a5500e7a0d0a2de049f64af920f6084b5a79ffb9 Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Mon, 22 Oct 2018 15:53:29 +0200 Subject: [PATCH] Fix bad join on ChangeTag subquery Bug: T207313 Change-Id: Iae6440630a533dfbcee3ccec34a9f231d3d013b5 --- includes/changetags/ChangeTags.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index d9ca8d7b9a..1d303c77b5 100644 --- a/includes/changetags/ChangeTags.php +++ b/includes/changetags/ChangeTags.php @@ -807,15 +807,15 @@ class ChangeTags { $tagTables[] = 'change_tag'; if ( $wgChangeTagsSchemaMigrationStage > MIGRATION_WRITE_BOTH ) { $tagTables[] = 'change_tag_def'; - $join_cond_ts_tags = [ $join_cond, 'ct_tag_id=ctd_id' ]; + $join_cond_ts_tags = [ 'change_tag_def' => [ 'INNER JOIN', 'ct_tag_id=ctd_id' ] ]; $field = 'ctd_name'; } else { $field = 'ct_tag'; - $join_cond_ts_tags = $join_cond; + $join_cond_ts_tags = []; } $fields['ts_tags'] = wfGetDB( DB_REPLICA )->buildGroupConcatField( - ',', $tagTables, $field, $join_cond_ts_tags + ',', $tagTables, $field, $join_cond, $join_cond_ts_tags ); if ( $wgUseTagFilter && $filter_tag ) { -- 2.20.1