Merge branch 'dev' into 'dev'
# Conflicts: # include/photo/photo_driver.php
This commit is contained in:
commit
29f1f9c872
@ -173,14 +173,14 @@ abstract class dba_driver {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1') && (! strpbrk($server,':;'))) {
|
// if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1') && (! strpbrk($server,':;'))) {
|
||||||
if(! z_dns_check($server)) {
|
// if(! z_dns_check($server)) {
|
||||||
$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
|
// $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
|
||||||
$this->connected = false;
|
// $this->connected = false;
|
||||||
$this->db = null;
|
// $this->db = null;
|
||||||
return false;
|
// return false;
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -468,7 +468,7 @@ function db_columns($table) {
|
|||||||
if(ACTIVE_DBTYPE === DBTYPE_POSTGRES) {
|
if(ACTIVE_DBTYPE === DBTYPE_POSTGRES) {
|
||||||
$r = q("SELECT column_name as field FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '%s'",
|
$r = q("SELECT column_name as field FROM information_schema.columns WHERE table_schema = 'public' AND table_name = '%s'",
|
||||||
dbesc($table)
|
dbesc($table)
|
||||||
);
|
);
|
||||||
if($r) {
|
if($r) {
|
||||||
return ids_to_array($r,'field');
|
return ids_to_array($r,'field');
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user