X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fchangetags%2FChangeTags.php;h=2169a4d72e5dc8076e77f606a8bbe3f565545a00;hb=11200fc58e6e4ccf322948ae4e2471dc20c4ae59;hp=91877f24f819f3a431148b77605cf8175f1d1f81;hpb=80a999362cc909232a9015ed03bef5288d289a15;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php index 91877f24f8..2169a4d72e 100644 --- a/includes/changetags/ChangeTags.php +++ b/includes/changetags/ChangeTags.php @@ -604,7 +604,7 @@ class ChangeTags { * @param int|null $rc_id The rc_id of the change to add the tags to * @param int|null $rev_id The rev_id of the change to add the tags to * @param int|null $log_id The log_id of the change to add the tags to - * @param string $params Params to put in the ct_params field of table + * @param string|null $params Params to put in the ct_params field of table * 'change_tag' when adding tags * @param string $reason Comment for the log * @param User $user Who to give credit for the action @@ -756,7 +756,7 @@ class ChangeTags { // Add an INNER JOIN on change_tag $tables[] = 'change_tag'; - $join_conds['change_tag'] = [ 'INNER JOIN', $join_cond ]; + $join_conds['change_tag'] = [ 'JOIN', $join_cond ]; $filterTagIds = []; $changeTagDefStore = MediaWikiServices::getInstance()->getChangeTagDefStore(); foreach ( (array)$filter_tag as $filterTagName ) { @@ -766,7 +766,7 @@ class ChangeTags { // Return nothing. $conds[] = '0'; break; - }; + } } if ( $filterTagIds !== [] ) { @@ -808,7 +808,7 @@ class ChangeTags { } $tagTables = [ 'change_tag', 'change_tag_def' ]; - $join_cond_ts_tags = [ 'change_tag_def' => [ 'INNER JOIN', 'ct_tag_id=ctd_id' ] ]; + $join_cond_ts_tags = [ 'change_tag_def' => [ 'JOIN', 'ct_tag_id=ctd_id' ] ]; $field = 'ctd_name'; return wfGetDB( DB_REPLICA )->buildGroupConcatField(