diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-24 07:23:43 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-24 07:23:43 +0100 |
| commit | 2b2723cb74dd74fc449d76f29edd7797b16c7e84 (patch) | |
| tree | 23e002e6e22211e3dba7742a4ea50ffc14653f95 /include | |
| parent | 7338649fa54a109122deecc743079eab6b9c1251 (diff) | |
| parent | e485ecb3b453a50a1974992b5ccf5122e154a5dc (diff) | |
| download | volse-hubzilla-2b2723cb74dd74fc449d76f29edd7797b16c7e84.tar.gz volse-hubzilla-2b2723cb74dd74fc449d76f29edd7797b16c7e84.tar.bz2 volse-hubzilla-2b2723cb74dd74fc449d76f29edd7797b16c7e84.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
| -rwxr-xr-x | include/dba/dba_driver.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index 708d8e709..1fb3d5c00 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -137,7 +137,7 @@ abstract class dba_driver { } if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { - if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { + if((! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) && (! filter_var($server, FILTER_VALIDATE_IP))) { $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server); $this->connected = false; $this->db = null; |