fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-24 18:05:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix blocking subdomains of an already-blocked domain (#26392)

Browse source
This commit is contained in:
Claire 2023-08-09 09:39:36 +02:00
parent 86afbf25d0
commit 6339806f05
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/domain_blocks_controller.rb
View file

@ -37,7 +37,7 @@ module Admin
@domain_block.errors.delete(:domain) @domain_block.errors.delete(:domain)
render :new render :new
else else
if existing_domain_block.present? if existing_domain_block.present? && existing_domain_block.domain == TagManager.instance.normalize_domain(@domain_block.domain.strip)
@domain_block = existing_domain_block @domain_block = existing_domain_block
@domain_block.update(resource_params) @domain_block.update(resource_params)
end end