chinwag/chinwagsocial
chinwag/chinwagsocial
2
0
Fork 0
Code Issues Pull requests Releases 14 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 • committed by GitHub
commit b12d75ef4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -40,7 +40,7 @@ module Admin
end
# Allow transparently upgrading a domain block
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.assign_attributes(resource_params)
end