diff options
| author | Damien Regad <dregad@mantisbt.org> | 2020-12-16 12:12:58 +0100 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2020-12-16 12:12:58 +0100 |
| commit | 5dd6ca30fb8cbecd670ccb2e5b0ba7771ed4d10a (patch) | |
| tree | 812cea16fa240eac259353a945e1c34b51332252 /adodb-time.inc.php | |
| parent | 116faba4fb17e73bd25908803e6f39a6456668f0 (diff) | |
| parent | 7268b997762f168cc8e079a7dd919527eaa6325d (diff) | |
| download | adodb-5dd6ca30fb8cbecd670ccb2e5b0ba7771ed4d10a.tar.gz adodb-5dd6ca30fb8cbecd670ccb2e5b0ba7771ed4d10a.tar.bz2 adodb-5dd6ca30fb8cbecd670ccb2e5b0ba7771ed4d10a.zip | |
Merge branch 'hotfix/5.20' (v5.20.19)
Note on merge conflict in adodb.inc.php:
At line 5133, parse_url() is called with `@` operator in the hotfix/5.20
branch (commit 2026e66e86f35995eee32557c2f83f1d539ca9c7) whereas the
same change in the master branch (commit c1a6794ece2b02c2a5d238159ae85da3cbd6d)
is without it. Code was kept as it is in master.
# Conflicts:
# adodb-lib.inc.php
# adodb.inc.php
# drivers/adodb-mssqlnative.inc.php
# drivers/adodb-mysqli.inc.php
# drivers/adodb-pdo.inc.php
Diffstat (limited to 'adodb-time.inc.php')
| -rw-r--r-- | adodb-time.inc.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/adodb-time.inc.php b/adodb-time.inc.php index 4e2531c3..4102890c 100644 --- a/adodb-time.inc.php +++ b/adodb-time.inc.php @@ -66,13 +66,6 @@ COPYRIGHT jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year and originally found at http://www.php.net/manual/en/function.mktime.php -============================================================================= - -BUG REPORTS - -These should be posted to the ADOdb forums at - - http://phplens.com/lens/lensforum/topics.php?id=4 ============================================================================= @@ -348,7 +341,7 @@ January!!!), changed adodb_get_gmt_diff() to ignore daylight savings. - 9 Aug 2003 0.10 Fixed bug with dates after 2038. -See http://phplens.com/lens/lensforum/msgs.php?id=6980 +See PHPLens Issue No: 6980 - 1 July 2003 0.09 Added support for Q (Quarter). @@ -1392,7 +1385,7 @@ global $ADODB_DATE_LOCALE; $sep = substr($tstr,2,1); $hasAM = strrpos($tstr,'M') !== false; */ - # see http://phplens.com/lens/lensforum/msgs.php?id=14865 for reasoning, and changelog for version 0.24 + # see PHPLens Issue No: 14865 for reasoning, and changelog for version 0.24 $dstr = gmstrftime('%x',31366800); // 30 Dec 1970, 1 am $sep = substr($dstr,2,1); $tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am |