Fix likes and reposts showing in standard Comments block when other plugins also filter comment types#2981

pfefferle wants to merge 3 commits intotrunkAutomattic/wordpress-activitypub:trunkfrom

fix/comment-query-type-not-in-mergeAutomattic/wordpress-activitypub:fix/comment-query-type-not-in-mergeCopy head branch name to clipboard