Merge branch 'develop' of https://github.com/friendica/friendica into develop

This commit is contained in:
Philipp Holzer 2018-06-26 22:56:08 +02:00
commit 2260b9c873
No known key found for this signature in database
GPG key ID: 58160D7D6AF942B6
10 changed files with 3960 additions and 3811 deletions

View file

@ -492,7 +492,10 @@ class Network
$h = substr($addr, strpos($addr, '@') + 1);
if (($h) && (dns_get_record($h, DNS_A + DNS_CNAME + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
if (($h) && (dns_get_record($h, DNS_A + DNS_MX) || filter_var($h, FILTER_VALIDATE_IP) )) {
return true;
}
if (($h) && dns_get_record($h, DNS_CNAME + DNS_MX)) {
return true;
}
return false;