From: Marcus Müller <marcusmueller@protonmail.com>
Date: Fri, 13 Apr 2018 07:41:24 +0000 (+0200)
Subject: Merge branch 'develop' into patch-1
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3761797e5fde26ecc89493789f5885aa2a176322;p=friendica.git

Merge branch 'develop' into patch-1
---

3761797e5fde26ecc89493789f5885aa2a176322
diff --cc include/dba.php
index 4252558346,208cf58121..b24d9b409d
--- a/include/dba.php
+++ b/include/dba.php
@@@ -52,9 -52,8 +52,9 @@@ class dba 
  		}
  
  		if ($install) {
 -			if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
 +			// server has to be a non-empty string that is not 'localhost' and not an IP
 +			if (strlen($server) && ($server !== 'localhost') && filter_var($server, FILTER_VALIDATE_IP) === false) {
- 				if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
+ 				if (! dns_get_record($server, DNS_A + DNS_CNAME)) {
  					self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server);
  					return false;
  				}