mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

MDL-73664 lib: Set Moodle files after ADODB upgrade

Browse Source
This commit is contained in:
Amaia Anabitarte 2022-02-01 17:12:43 +01:00
parent 47ea43f5e8
commit 0023f63772
5 changed files with 24 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/adodb/adodb-iterator.inc.php
View File

@ -1,26 +0,0 @@
<?php
/*
@version v5.21.0 2021-02-27
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4.
Declares the ADODB Base Class for PHP5 "ADODB_BASE_RS", and supports iteration with
the ADODB_Iterator class.
$rs = $db->Execute("select * from adoxyz");
foreach($rs as $k => $v) {
echo $k; print_r($v); echo "<br>";
}
Iterator code based on http://cvs.php.net/cvs.php/php-src/ext/spl/examples/cachingiterator.inc?login=2
Moved to adodb.inc.php to improve performance.
*/

16
lib/adodb/adodb-php4.inc.php
View File

@ -1,16 +0,0 @@
<?php
/*
@version v5.21.0 2021-02-27
@copyright (c) 2000-2013 John Lim (jlim#natsoft.com). All rights reserved.
@copyright (c) 2014 Damien Regad, Mark Newnham and the ADOdb community
Released under both BSD license and Lesser GPL library license.
Whenever there is any discrepancy between the two licenses,
the BSD license will take precedence.
Set tabs to 4.
*/
class ADODB_BASE_RS {
}

19
lib/adodb/lang/adodb-en.inc.php
View File

@ -1,4 +1,23 @@
<?php
/**
* English language strings.
*
* This file is part of ADOdb, a Database Abstraction Layer library for PHP.
*
* @package ADOdb
* @link https://adodb.org Project's web site and documentation
* @link https://github.com/ADOdb/ADOdb Source code and issue tracker
*
* The ADOdb Library is dual-licensed, released under both the BSD 3-Clause
* and the GNU Lesser General Public Licence (LGPL) v2.1 or, at your option,
* any later version. This means you can use it in proprietary products.
* See the LICENSE.md file distributed with this source code for details.
* @license BSD-3-Clause
* @license LGPL-2.1-or-later
*
* @copyright 2000-2013 John Lim
* @copyright 2014 Damien Regad, Mark Newnham and the ADOdb community
*/
$ADODB_LANG_ARRAY = array (
'LANG' => 'en',

11
lib/adodb/readme_moodle.txt
View File

@ -1,4 +1,4 @@
Description of ADOdb v5.21.0 library import into Moodle 3.11 and up
Description of ADOdb v5.21.4 library import into Moodle 4.0 and up
Source: https://github.com/ADOdb/ADOdb
@ -14,15 +14,12 @@ Removed:
* lang/* everything but adodb-en.inc.php (originally because they were not utf-8, now because of not used)
* nbproject/ (if present)
* pear/
* replicate/
* scripts/
* replicate/ (if present)
* scripts/ (if present)
* server.php
* session/
* tests/
* tests/ (if present)
Added:
* index.html - prevent directory browsing on misconfigured servers
* readme_moodle.txt - this file ;-)
Our changes (to be checked on next update if they are already applied upstream)::
* https://github.com/ADOdb/ADOdb/issues/711

2
lib/thirdpartylibs.xml
View File

@ -4,7 +4,7 @@
<location>adodb</location>
<name>AdoDB</name>
<license>BSD/LGPL</license>
<version>5.21.0</version>
<version>5.21.4</version>
<licenseversion>3-Clause/2.1+</licenseversion>
</library>
<library>