github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-24 17:15:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Hunt-and-kill a few more mis-encoded params

Browse Source 
https://meta.discourse.org/t/tags-does-not-work-with-cyrillic/67217/6?u=mpalmer
This commit is contained in:
Matt Palmer 2017-08-01 18:03:36 +10:00
parent bac21d317b
commit 67882ec37d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/tags_controller.rb
View File

@ -49,8 +49,8 @@ class TagsController < ::ApplicationController
Discourse.filters.each do |filter|
define_method("show_#{filter}") do
@tag_id = params[:tag_id]
@additional_tags = params[:additional_tag_ids].to_s.split('/')
@tag_id = params[:tag_id].force_encoding("UTF-8")
@additional_tags = params[:additional_tag_ids].to_s.split('/').map { |t| t.force_encoding("UTF-8") }
list_opts = build_topic_list_options
@ -67,7 +67,7 @@ class TagsController < ::ApplicationController
@title = @description_meta
path_name = url_method(params.slice(:category, :parent_category))
canonical_url "#{Discourse.base_url_no_prefix}#{public_send(path_name, *(params.slice(:parent_category, :category, :tag_id).values))}"
canonical_url "#{Discourse.base_url_no_prefix}#{public_send(path_name, *(params.slice(:parent_category, :category, :tag_id).values.map { |t| t.force_encoding("UTF-8") }))}"
if @list.topics.size == 0 && params[:tag_id] != 'none' && !Tag.where(name: @tag_id).exists?
permalink_redirect_or_not_found