Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:

#	wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php

diff --cc wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
index fe73a9edfd9b9353afacc867f44f2ebcc3789018,9ba132795ea4a427d41904952c77131160b088e0..ea53c1bb39ddfc6dcb9099e9a92ed8f486cd9edf
--- 1/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
--- 2/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
+++ b/wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
@@@ -236,7 -153,7 +236,7 @@@ class HtmlOutputNodeImg extends Abstrac
                        }
                }
                
 -              $host = @parse_url($src, PHP_URL_HOST);
 -              return $host !== false && ($host === null || in_array($host, $ownDomains));
 +              $host = Url::parse($src)['host'];
-               return in_array($host, $ownDomains);
++              return !$host || in_array($host, $ownDomains);
        }
  }