diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-11-11 14:01:25 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-11-11 14:01:25 +0100 |
| commit | d57cdf645eaef9dec124c3e517c979c359bc8906 (patch) | |
| tree | 223ff778be767c230abda7e5c83f62776a8b84ee /include | |
| parent | 750d6f4be93a6b638d55cba8d9f22d4b93a83fce (diff) | |
| parent | e47a96bf247322fa12b5543c42cf69519039c1c3 (diff) | |
| download | volse-hubzilla-d57cdf645eaef9dec124c3e517c979c359bc8906.tar.gz volse-hubzilla-d57cdf645eaef9dec124c3e517c979c359bc8906.tar.bz2 volse-hubzilla-d57cdf645eaef9dec124c3e517c979c359bc8906.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include')
| -rwxr-xr-x | include/dba/dba_driver.php | 18 | ||||
| -rw-r--r-- | include/photo/photo_driver.php | 2 |
2 files changed, 10 insertions, 10 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'); } diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php index cced7bf03..4173d727e 100644 --- a/include/photo/photo_driver.php +++ b/include/photo/photo_driver.php @@ -637,7 +637,7 @@ function import_xchan_photo($photo,$xchan,$thing = false,$force = false) { if(is_null($type)) $photo_failure = true; } - elseif($result['return_code'] === 304) { + elseif($result['return_code'] == 304) { $photo = z_root() . '/photo/' . $hash . '-4'; $thumb = z_root() . '/photo/' . $hash . '-5'; $micro = z_root() . '/photo/' . $hash . '-6'; |