| Age | Commit message (Collapse) | Author | Files | Lines |
|
Try to do it right this time...
# Conflicts:
# adodb-memcache.lib.inc.php
Fixes #751
|
|
Fixes #751
|
|
The conflicts resolution applied when merging the Standardized file
headers (commit e9dcce3df24912ad869d0193f0b419f2309101fc) was seriously
messed up, actually overwriting a number of changes in the master
branch.
Rather than trying to go and fix things one by one which has a high risk
of messing things further, it's easier to redo the merge from a clean
slate, so this commit reverts the following:
- "Merge branch 'hotfix/5.21' Standardized file headers",
e9dcce3df24912ad869d0193f0b419f2309101fc
- "Merge tag 'v5.21.1'",
5f437df3104159d5d659f60e31bef8d33c34995f
- "Reset version to 5.22.0-dev"
af9234a525c3255af051a330164486d73be4c63a
- "Fix incorrect resolution of merge conflicts"
a6733f61b0165b366c8d2c70d9af82edc3881951.
- "Fix syntax error in toexport.inc.php"
20b01e83cb61b6b2460f64c7d1277c5f4cc28574.
Fixes #751
|
|
|
|
|
|
|
|
|
|
|
|
Change web site references from http://adodb.org to https.
|
|
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
|
|
|
|
|
|
Site no longer active
|
|
|
|
|
|
|
|
|
|
Documenting the reason for the $ignored parameter.
|
|
Function checked for PHP5, and made a separate display string for
versions < 5.
|
|
The PHP date object was only available for PHP > 5.0. The code tested
for version in order to use the class.
|
|
|
|
|
|
|
|
|
|
|
|
# Conflicts:
# adodb-lib.inc.php
# adodb-time.inc.php
|
|
|
|
The BindTimeStamp and adodb_getdate functions are susceptible to abuse, see #467. The new constant ADODB_FUTURE_DATE_CUTOFF_YEARS limits the future years. see the documentation http://adodb.org/dokuwiki/doku.php?id=v5:datetime:adodb_last_date_status for more information
|
|
The BindTimeStamp and adodb_getdate functions are susceptible to abuse, see #467. The new constant ADODB_FUTURE_DATE_CUTOFF_YEARS limits the future years. see the documentation http://adodb.org/dokuwiki/doku.php?id=v5:datetime:adodb_last_date_status for more information
|
|
# Conflicts:
# adodb-time.inc.php
# docs/changelog.md
# drivers/adodb-mssql.inc.php
# drivers/adodb-mssqlnative.inc.php
# drivers/adodb-oci8po.inc.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Given year can only be less than 3000 or greater than 1000.
Fixes #375
|
|
|
|
|
|
|
|
|
|
|
|
|
|
The ADOdb date/time library did not include support for the time format
'W' which returns the week of the year (1-52) that the provided date
falls into.
This format is supported by the standard PHP library, which means that
if the provided date falls outside the 32-bit date range where adodb
hands off data calculations to the standard gmdate for performance
reasons, then the value is not calculated.
'W' is one of the standard identifiers used by sqlDate(), and adodb_date
is used by sqlite to perform date calculations.
Fixes #223
|
|
The ADOdb date/time library includes support for the time format 'Q'
which returns the quarter of the year that the provided date falls into.
This format is not supported by the standard PHP library, which means
that if the provided date falls into the 32-bit date range where ADOdb
hands off data calculations to the standard gmdate() for performance
reasons, then the value is not calculated.
The solution would be that, if a supplied format contained the 'Q'
character, it would bypass the normal 32 bit test and be handled by the
adodb date library in adodb_date()
In addition, the quarter function does not return the correct value, it
returns 3rds of a year instead of Quarters.
Fixes #222
|
|
|
|
|
|
|