diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-10-12 12:13:44 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-10-12 12:13:44 +0200 |
| commit | cf547be1d6900d12719a9372cbc1a5d433d31863 (patch) | |
| tree | 03a525cf40905adafc21b0c4146e467bad288437 /include/dba | |
| parent | 29617737ca2c03c800ebbe4701dc21cf9f25ce22 (diff) | |
| parent | 16da1a4e810889448eecbd13d68183a820bcebe2 (diff) | |
| download | volse-hubzilla-cf547be1d6900d12719a9372cbc1a5d433d31863.tar.gz volse-hubzilla-cf547be1d6900d12719a9372cbc1a5d433d31863.tar.bz2 volse-hubzilla-cf547be1d6900d12719a9372cbc1a5d433d31863.zip | |
Merge branch '1.14RC'
Diffstat (limited to 'include/dba')
| -rwxr-xr-x | include/dba/dba_driver.php | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index 1905241a7..852dc16af 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -62,6 +62,8 @@ class DBA { if(is_object(self::$dba) && self::$dba->connected) { + if($server === 'localhost') + $port = $set_port; $dns = ((self::$dbtype == DBTYPE_POSTGRES) ? 'postgres' : 'mysql') . ':host=' . $server . (is_null($port) ? '' : ';port=' . $port) . ';dbname=' . $db; @@ -84,7 +86,7 @@ class DBA { abstract class dba_driver { // legacy behavior const INSTALL_SCRIPT='install/schema_mysql.sql'; - const NULL_DATE = '0000-00-00 00:00:00'; + const NULL_DATE = '0001-01-01 00:00:00'; const UTC_NOW = 'UTC_TIMESTAMP()'; protected $db; @@ -260,11 +262,8 @@ function dbg($state) { */ function dbesc($str) { - if(ACTIVE_DBTYPE == DBTYPE_POSTGRES && $str === '0000-00-00 00:00:00') { + if(is_null_date($str)) $str = NULL_DATE; - } else if(ACTIVE_DBTYPE != DBTYPE_POSTGRES && $str === '0001-01-01 00:00:00') { - $str = NULL_DATE; - } if(\DBA::$dba && \DBA::$dba->connected) return(\DBA::$dba->escape($str)); @@ -280,12 +279,9 @@ function dbunescbin($str) { } function dbescdate($date) { - if(ACTIVE_DBTYPE == DBTYPE_POSTGRES && $date === '0000-00-00 00:00:00') { - $date = NULL_DATE; - } else if(ACTIVE_DBTYPE != DBTYPE_POSTGRES && $date === '0001-01-01 00:00:00') { - $date = NULL_DATE; - } - return $date; + if(is_null_date($date)) + return \DBA::$dba->escape(NULL_DATE); + return \DBA::$dba->escape($date); } function db_quoteinterval($txt) { @@ -380,11 +376,8 @@ function dbq($sql) { function dbesc_array_cb(&$item, $key) { if(is_string($item)) { - if($item == '0000-00-00 00:00:00' && ACTIVE_DBTYPE == DBTYPE_POSTGRES) - $item = '0001-01-01 00:00:00'; - else if($item == '0001-01-01 00:00:00' && ACTIVE_DBTYPE == DBTYPE_MYSQL) - $item = '0000-00-00 00:00:00'; - + if(is_null_date($item)) + $item = NULL_DATE; $item = dbesc($item); } } @@ -439,4 +432,4 @@ function db_logger($s,$level = LOGGER_NORMAL,$syslog = LOG_INFO) { logger($s,$level,$syslog); \DBA::$logging = false; \DBA::$dba->debug = $saved; -}
\ No newline at end of file +} |