Merge branch 'hotfix/5.20.10'

LICENSE.md

@@ -1,19 +1,22 @@
 ADOdb License
 =============
 
-ADOdb is dual licensed under BSD and LGPL.
+The ADOdb Library is dual-licensed, released under both the
+[BSD 3-clause](#bsd-3-clause-license) and the
+[GNU Lesser General Public License (LGPL) v2.1](#gnu-lesser-general-public-license)
+or, at your option, any later version.
 
 In plain English, you do not need to distribute your application in source code form,
 nor do you need to distribute ADOdb source code, provided you follow the rest of
 terms of the BSD license.
 
-For more info about ADOdb, visit http://adodb.sourceforge.net/
+For more information about ADOdb, visit http://adodb.org/
 
 BSD 3-Clause License
 --------------------
 
-(c) 2000-2013 John Lim (jlim@natsoft.com)
-(c) 2014      Damien Regad, Mark Newnham and the ADOdb community
+(c) 2000-2013 John Lim (jlim@natsoft.com)  
+(c) 2014      Damien Regad, Mark Newnham and the ADOdb community  
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -5,25 +5,19 @@ ADOdb Library for PHP5
 [![Download ADOdb](https://img.shields.io/sourceforge/dm/adodb.svg)](https://sourceforge.net/projects/adodb/files/latest/download)
 
 (c) 2000-2013 John Lim (jlim@natsoft.com)  
-(c) 2014      Damien Regad, Mark Newnham and the ADOdb community
-
-Released under both [BSD 3-Clause](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#bsd-3-clause-license) 
-and [GNU Lesser GPL library 2.1](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#gnu-lesser-general-public-license) 
-licenses.  
-This means you can use it in proprietary products; 
+(c) 2014      Damien Regad, Mark Newnham and the
+              [ADOdb community](https://github.com/ADOdb/ADOdb/graphs/contributors)
+
+The ADOdb Library is dual-licensed, released under both the
+[BSD 3-Clause](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#bsd-3-clause-license) 
+and the
+[GNU Lesser General Public Licence (LGPL) v2.1](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md#gnu-lesser-general-public-license)
+or, at your option, any later version. 
+This means you can use it in proprietary products;
 see [License](https://github.com/ADOdb/ADOdb/blob/master/LICENSE.md) for details.
 
 Home page: http://adodb.org/
 
-> **WARNING: known issue with Associative Fetch Mode in ADOdb v5.19
--- PLEASE UPGRADE TO v5.20 !**  
-> When fetching data in Associative mode (i.e. when `$ADODB_FETCH_MODE` is
-> set to *ADODB_FETCH_ASSOC*), recordsets do not return any data (empty strings)
-> when using some database drivers. The problem has been reported on MSSQL,
-> Interbase and Foxpro, but possibly affects other drivers as well; all drivers
-> derived from the above are also impacted.
-> For further details, please refer to [Issue #20](https://github.com/ADOdb/ADOdb/issues/20).
-
 
 Introduction
 ============

composer.json

@@ -1,7 +1,7 @@
 {
 	"name" : "adodb/adodb-php",
 	"description" : "ADOdb is a PHP database abstraction layer library",
-	"license" : [ "BSD-3-Clause", "LGPL-2.1" ],
+	"license" : [ "BSD-3-Clause", "LGPL-2.1-or-later" ],
 	"authors" : [
 		{
 			"name": "John Lim",