IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Correct slug validation

Browse Source 
We were allowing new categories to use slugs like "2342-category".
This commit is contained in:
Daniel Waterworth
2019-10-30 14:45:34 +00:00
parent 580a4a827b
commit 32107a9a72
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/category.rb
View File

@@ -294,10 +294,11 @@ class Category < ActiveRecord::Base
self.slug = Slug.for(name, '')
self.slug = '' if duplicate_slug?
end
# only allow to use category itself id. new_record doesn't have a id.
unless new_record?
match_id = /^(\d+)-category/.match(self.slug)
errors.add(:slug, :invalid) if match_id && match_id[1] && match_id[1] != self.id.to_s
# only allow to use category itself id.
match_id = /^(\d+)-/.match(self.slug)
if match_id.present?
errors.add(:slug, :invalid) if new_record? || (match_id[1] != self.id.to_s)
end
end