mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 20:36:39 +08:00
d9a02d1336
This reverts commit20780a1eee. * SECURITY: re-adds accidentally reverted commit: 03d26cd6: ensure embed_url contains valid http(s) uri * when the merge commite62a85cfwas reverted, git chose the2660c2e2parent to land on instead of the03d26cd6parent (which contains security fixes)
26 lines
655 B
Ruby
26 lines
655 B
Ruby
# frozen_string_literal: true
|
|
|
|
module TopicQueryParams
|
|
def build_topic_list_options
|
|
options = {}
|
|
params[:tags] = [params[:tag_id]] if params[:tag_id].present? && guardian.can_tag_pms?
|
|
|
|
TopicQuery.public_valid_options.each do |key|
|
|
if params.key?(key)
|
|
val = options[key] = params[key]
|
|
if !TopicQuery.validate?(key, val)
|
|
raise Discourse::InvalidParameters.new key
|
|
end
|
|
end
|
|
end
|
|
|
|
# hacky columns get special handling
|
|
options[:topic_ids] = param_to_integer_list(:topic_ids)
|
|
if options[:no_subcategories] == 'true'
|
|
options[:no_subcategories] = true
|
|
end
|
|
|
|
options
|
|
end
|
|
end
|