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

DEV: Use correct method for creating slugs (#31273)

Browse Source 
Empty slugs for topics break Discourse. This makes sure that we always
fall back to "topic" as default. And it also uses the configured slug
generation method instead of always using ASCII.
This commit is contained in:
Gerhard Schlager 2025-02-11 16:29:08 +01:00 committed by GitHub
parent 8129be36e6
commit 9279487079
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
script/bulk_import/base.rb
View File

@ -1431,7 +1431,7 @@ class BulkImport::Base
category[:name] = name category[:name] = name
category[:name_lower] = name_lower category[:name_lower] = name_lower
category[:slug] ||= Slug.ascii_generator(name_lower) category[:slug] ||= Slug.for(name_lower, "") # TODO Ensure that slug doesn't exist yet
category[:description] = (category[:description] || "").scrub.strip.presence category[:description] = (category[:description] || "").scrub.strip.presence
category[:user_id] ||= Discourse::SYSTEM_USER_ID category[:user_id] ||= Discourse::SYSTEM_USER_ID
category[:read_restricted] = false if category[:read_restricted].nil? category[:read_restricted] = false if category[:read_restricted].nil?
@ -1476,7 +1476,7 @@ class BulkImport::Base
topic[:archetype] ||= Archetype.default topic[:archetype] ||= Archetype.default
topic[:title] = topic[:title][0...255].scrub.strip topic[:title] = topic[:title][0...255].scrub.strip
topic[:fancy_title] ||= pre_fancy(topic[:title]) topic[:fancy_title] ||= pre_fancy(topic[:title])
topic[:slug] ||= Slug.ascii_generator(topic[:title]) topic[:slug] ||= Slug.for(topic[:title])
topic[:user_id] ||= Discourse::SYSTEM_USER_ID topic[:user_id] ||= Discourse::SYSTEM_USER_ID
topic[:last_post_user_id] ||= topic[:user_id] topic[:last_post_user_id] ||= topic[:user_id]
topic[:category_id] ||= -1 if topic[:archetype] != Archetype.private_message topic[:category_id] ||= -1 if topic[:archetype] != Archetype.private_message
@ -1892,7 +1892,7 @@ class BulkImport::Base
.scrub .scrub
.strip .strip
.presence .presence
chat_channel[:slug] ||= Slug.ascii_generator(chat_channel[:name]) chat_channel[:slug] ||= Slug.for(chat_channel[:name], "") # TODO Ensure that slug isn't a duplicate
end end
chat_channel[:description] = chat_channel[:description][0..500].scrub.strip if chat_channel[ chat_channel[:description] = chat_channel[:description][0..500].scrub.strip if chat_channel[