Index: trunk/kernel/include/adodb/adodb-time.inc.php =================================================================== diff -u -r413 -r535 --- trunk/kernel/include/adodb/adodb-time.inc.php (.../adodb-time.inc.php) (revision 413) +++ trunk/kernel/include/adodb/adodb-time.inc.php (.../adodb-time.inc.php) (revision 535) @@ -221,7 +221,7 @@ /* We check for Windows as only +ve ints are accepted as dates on Windows. - + Apparently this problem happens also with Linux, RH 7.3 and later! glibc-2.2.5-34 and greater has been changed to return -1 for dates < @@ -488,7 +488,7 @@ static $DIFF; if (isset($DIFF)) return $DIFF; - $DIFF = mktime(0,0,0,1,2,1970) - gmmktime(0,0,0,1,2,1970); + $DIFF = mktime(0,0,0,1,2,2000) - gmmktime(0,0,0,1,2,2000); return $DIFF; } @@ -515,7 +515,7 @@ */ function _adodb_getdate($origd=false,$fast=false,$is_gmt=false) { - $d = $origd - ($is_gmt ? adodb_get_gmt_different() : 0 ); + $d = $origd - ($is_gmt ? 0 : adodb_get_gmt_different()); $_day_power = 86400; $_hour_power = 3600; @@ -709,9 +709,9 @@ // HOUR case 'Z': - $dates .= ($is_gmt) ? -adodb_get_gmt_different() : 0; break; + $dates .= ($is_gmt) ? 0 : -adodb_get_gmt_different(); break; case 'O': - $gmt = ($is_gmt) ? adodb_get_gmt_different() : 0; + $gmt = ($is_gmt) ? 0 : adodb_get_gmt_different(); $dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36); break; case 'H': @@ -791,7 +791,7 @@ return @mktime($hr,$min,$sec,$mon,$day,$year); } - $gmt_different = ($is_gmt) ? adodb_get_gmt_different() : 0; + $gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_different(); $hr = intval($hr); $min = intval($min);