From: Marcel Werk <burntime@woltlab.com>
Date: Mon, 9 Jul 2018 13:45:24 +0000 (+0200)
Subject: Merge remote-tracking branch 'refs/remotes/origin/3.0'
X-Git-Tag: 3.1.5~34
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4aba5d392736deab1e60e9d65b50daab482a3b73;p=GitHub%2FWoltLab%2FWCF.git

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

# Conflicts:

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

4aba5d392736deab1e60e9d65b50daab482a3b73
diff --cc wcfsetup/install/files/lib/system/html/output/node/HtmlOutputNodeImg.class.php
index fe73a9edfd,9ba132795e..ea53c1bb39
--- a/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);
  	}
  }