github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 13:51:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

correct exception handling, always do to_i in array

Browse Source
This commit is contained in:
Sam
2018-08-15 11:31:42 +10:00
parent 1172e141cd
commit 06f82a7d72
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/topic_query.rb
View File

@ -18,7 +18,7 @@ class TopicQuery
end
array_int = lambda do |x|
Array === x && x.length > 0 && x.all? { |i| Integer === i }
Array === x && x.length > 0 && x.all? { |i| Integer === i || i.match?(/^-?[0-9]+$/) }
end
{
@ -656,7 +656,7 @@ class TopicQuery
result = apply_shared_drafts(result, category_id, options)
if options[:exclude_category_ids] && options[:exclude_category_ids].is_a?(Array) && options[:exclude_category_ids].size > 0
result = result.where("categories.id NOT IN (?)", options[:exclude_category_ids]).references(:categories)
result = result.where("categories.id NOT IN (?)", options[:exclude_category_ids].map(&:to_i)).references(:categories)
end
# Don't include the category topics if excluded