diff options
| author | Damien Regad <dregad@mantisbt.org> | 2019-01-03 00:11:03 +0100 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2019-01-03 00:11:03 +0100 |
| commit | c4eebb207131feb946a12993a054b7889f7d13e0 (patch) | |
| tree | 4da0c5e0f810476423034c163d3aa25091f45bae /adodb-time.inc.php | |
| parent | a3fd0e8ce1e4905814c5bcc0c560cffde786378a (diff) | |
| parent | 3ad9cdedb01e60f58ad9cc34b0361506182c12e3 (diff) | |
| download | adodb-c4eebb207131feb946a12993a054b7889f7d13e0.tar.gz adodb-c4eebb207131feb946a12993a054b7889f7d13e0.tar.bz2 adodb-c4eebb207131feb946a12993a054b7889f7d13e0.zip | |
Merge branch 'hotfix/5.20'
# Conflicts:
# adodb-lib.inc.php
# adodb-time.inc.php
Diffstat (limited to 'adodb-time.inc.php')
| -rw-r--r-- | adodb-time.inc.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/adodb-time.inc.php b/adodb-time.inc.php index 1e8a0d34..8573b2e2 100644 --- a/adodb-time.inc.php +++ b/adodb-time.inc.php @@ -421,8 +421,9 @@ $ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2); if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1); -if (!DEFINED('ADODB_FUTURE_DATE_CUTOFF_YEARS')) - DEFINE('ADODB_FUTURE_DATE_CUTOFF_YEARS',200); +if (!DEFINED('ADODB_FUTURE_DATE_CUTOFF_YEARS')) + DEFINE('ADODB_FUTURE_DATE_CUTOFF_YEARS',200); + function adodb_date_test_date($y1,$m,$d=13) { $h = round(rand()% 24); @@ -842,12 +843,13 @@ global $_month_table_normal,$_month_table_leaf, $_adodb_last_date_call_failed; $_min_power = 60; $cutoffDate = time() + (60 * 60 * 24 * 365 * ADODB_FUTURE_DATE_CUTOFF_YEARS); - + if ($d > $cutoffDate) { $d = $cutoffDate; $_adodb_last_date_call_failed = true; } + if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction $_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31); @@ -1494,6 +1496,6 @@ global $ADODB_DATE_LOCALE; function adodb_last_date_status() { global $_adodb_last_date_call_failed; - + return $_adodb_last_date_call_failed; -}
\ No newline at end of file +} |