From: noiob <8197071+noiob@users.noreply.github.com>
Date: Thu, 21 Nov 2019 10:35:39 +0000 (+0100)
Subject: Fix whitelist federation for subdomains (#12435)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=5bc4edd0784ed26ada36405ec2ba78a972822983;p=mastodon.git

Fix whitelist federation for subdomains (#12435)
---

diff --git a/app/helpers/domain_control_helper.rb b/app/helpers/domain_control_helper.rb
index 067b2c2cd..ac60cad29 100644
--- a/app/helpers/domain_control_helper.rb
+++ b/app/helpers/domain_control_helper.rb
@@ -6,7 +6,7 @@ module DomainControlHelper
 
     domain = begin
       if uri_or_domain.include?('://')
-        Addressable::URI.parse(uri_or_domain).domain
+        Addressable::URI.parse(uri_or_domain).host
       else
         uri_or_domain
       end