Small refactor

core/Plugin/Controller.php

@@ -592,7 +592,7 @@ abstract class Controller
         $view->isValidHost = Url::isValidHost();
         if (!$view->isValidHost) {
             // invalid host, so display warning to user
-            $validHosts = Url::getTrustedHosts($filterEnrich = false);
+            $validHosts = Url::getTrustedHostsFromConfig();
             $validHost = $validHosts[0];
             $invalidHost = Common::sanitizeInputValue($_SERVER['HTTP_HOST']);
 

core/Url.php

@@ -537,11 +537,10 @@ class Url
             && in_array($parsedUrl['scheme'], array('http', 'https'));
     }
 
-    public static function getTrustedHosts( $filterEnrich = true )
+    public static function getTrustedHostsFromConfig()
     {
         $trustedHosts = @Config::getInstance()->General['trusted_hosts'];
-
-        if (empty($trustedHosts)) {
+        if (!is_array($trustedHosts)) {
             return array();
         }
         foreach ($trustedHosts as &$trustedHost) {
@@ -550,11 +549,15 @@ class Url
                 $trustedHost = parse_url($trustedHost, PHP_URL_HOST);
             }
         }
+        return $trustedHosts;
+    }
 
-        if($filterEnrich) {
-            /* used by Piwik PRO */
-            Piwik::postEvent('Url.filterTrustedHosts', array(&$trustedHosts));
-        }
+    public static function getTrustedHosts()
+    {
+        $trustedHosts = self::getTrustedHostsFromConfig();
+
+        /* used by Piwik PRO */
+        Piwik::postEvent('Url.filterTrustedHosts', array(&$trustedHosts));
 
         return $trustedHosts;
     }

plugins/CoreAdminHome/Controller.php

@@ -50,7 +50,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
         if (Piwik::hasUserSuperUserAccess()) {
             $this->handleGeneralSettingsAdmin($view);
 
-            $view->trustedHosts = Url::getTrustedHosts( $filterEnrich = false );
+            $view->trustedHosts = Url::getTrustedHostsFromConfig();
 
             $logo = new CustomLogo();
             $view->branding       = array('use_custom_logo' => $logo->isEnabled());