| Age | Commit message (Collapse) | Author | Files | Lines |
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- running SED script
- manual adjustments for files not processed by regex
|
|
|
|
|
|
The _insertid() method introduced in postgres9 driver really belongs in
postgres8, since OID field was actually removed in 8.1.
This commit creates new postgres8 classes, moves the method from the '9'
driver to the new ADODB_postgres8 class, and makes the '9' classes
inherit from postgres8 instead of postgres7.
|
|
|
|
Reverting change from d01454c0bf608ecd6625ccd9d968d45af7adac4c which
introduced a regression.
Fixes #8
|
|
|
|
|
|
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
|