| Age | Commit message (Collapse) | Author | Files | Lines |
|
Creation of dynamic property MyClass::$column is deprecated in
.../adodb/adodb-active-record.inc.php on line 115
Creation of dynamic property MyClass::$column is deprecated in
.../adodb/adodb-active-recordx.inc.php on line 119
Fixes #1068
|
|
adodb-active-record.inc.php. / ADODB_Active_Record::Update() throws
"strcmp(): Passing null to parameter 1 ($string1) of type string is
deprecated" when setting a column to null.
Apply the same code change to adodb-active-recordx.inc.php.
Fixes #1021
|
|
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.
|
|
|
|
|
|
|
|
# Conflicts:
# docs/changelog.md
|
|
Code cleanup: avoid use of "magic" numbers.
|
|
This is a regression from 9f81c75d4566fea795be7024c9415909f094bf15.
As part of a code cleanup exercise, an if statement was converted to
switch, but the evaluated expression was not correctly transformed.
|
|
Until now, active Record used an $ADODB_ASSOC_CASE *variable* to control
the fields' case, which is not used or referenced anywhere else in the
ADOdb library.
The correct, documented way of setting the fields' case in associative
fetch mode is to define the ADODB_ASSOC_CASE constant before including
adodb.inc.php.
This commit replaces usages of $ADODB_ASSOC_CASE variable by the
ADODB_ASSOC_CASE constant.
Fixes #536 (follow-up on #535)
|
|
|
|
# Conflicts:
# adodb-time.inc.php
# docs/changelog.md
# drivers/adodb-mssql.inc.php
# drivers/adodb-mssqlnative.inc.php
# drivers/adodb-oci8po.inc.php
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Most of the includes in adodb.inc.php are done with include_once but
in a couple locations its still done with include.
This is the case for adodb-lib.inc.php which is conditionally included
based on a global var. I ran into problems with running adodb in debug
mode while running phpunit tests. Phpunit will reset the global vars
and thus break the include mechanism. This is a problem of phpunit
and can be worked around. However it would make adodb more robust
to just use include_once everywhere. It will remove the dependency on
the $ADODB_INCLUDED_LIB global var.
I also replaced one include statement in adodb-time.inc.php, in various
drivers and other files too, so include_once is used everywhere.
Signed-off-by: Damien Regad <dregad@mantisbt.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- running SED script
- manual adjustments for files not processed by regex
|
|
And vice-versa.
Fixes #71
|
|
|
|
|
|
|
|
http://php.net/manual/en/language.basic-syntax.phptags.php
|
|
Bumped 'dev' version allows users who rely on source code downloaded
from the git repository rather than an official release tarball to
reliably determine that they are running a development version of the
library.
|
|
- Move all files in adodb5/ to root
- Remove adodb-for-php4/ directory
|