diff options
| author | Max Kostikov <max@kostikov.co> | 2018-11-10 20:47:35 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2018-11-10 20:47:35 +0100 |
| commit | 29f1f9c8727f281b52fed76ce4be0c5c66a7d038 (patch) | |
| tree | eac677dd7dd4ee5664ee3f6026f09e66b0ee5b0a /include | |
| parent | a49cfa81425b24c4c2b52eec67dd82649cd1bf61 (diff) | |
| parent | 01d8bd445e1ffa50e51f7eee0e72e83adeec1a6b (diff) | |
| download | volse-hubzilla-29f1f9c8727f281b52fed76ce4be0c5c66a7d038.tar.gz volse-hubzilla-29f1f9c8727f281b52fed76ce4be0c5c66a7d038.tar.bz2 volse-hubzilla-29f1f9c8727f281b52fed76ce4be0c5c66a7d038.zip | |
Merge branch 'dev' into 'dev'
# Conflicts:
# include/photo/photo_driver.php
Diffstat (limited to 'include')
| -rwxr-xr-x | include/dba/dba_driver.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index 9533acc7f..ee0e06a91 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -173,14 +173,14 @@ abstract class dba_driver { return false; } - if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1') && (! strpbrk($server,':;'))) { - if(! z_dns_check($server)) { - $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server); - $this->connected = false; - $this->db = null; - return false; - } - } + // if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1') && (! strpbrk($server,':;'))) { + // if(! z_dns_check($server)) { + // $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server); + // $this->connected = false; + // $this->db = null; + // return false; + // } + // } return true; } @@ -468,7 +468,7 @@ function db_columns($table) { if(ACTIVE_DBTYPE === DBTYPE_POSTGRES) { $r = q("SELECT column_name as field FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '%s'", dbesc($table) - ); + ); if($r) { return ids_to_array($r,'field'); } |