Merge branch 'MDL-65920_37' of https://github.com/dvdcastro/moodle into MOODLE_37_STABLE

This commit is contained in:
Eloy Lafuente (stronk7)
2020-01-08 10:20:13 +01:00
4 changed files with 8 additions and 3 deletions
+3 -1
View File
@@ -680,7 +680,9 @@ order by constraint_name, referenced_table_name, keyno";
$arr = $args;
}
array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
array_walk($arr, function(&$v) {
$v = "CAST(" . $v . " AS VARCHAR(255))";
});
$s = implode('+',$arr);
if (sizeof($arr) > 0) return "$s";
+3 -1
View File
@@ -527,7 +527,9 @@ class ADODB_mssqlnative extends ADOConnection {
$arr = $args;
}
array_walk($arr, create_function('&$v', '$v = "CAST(" . $v . " AS VARCHAR(255))";'));
array_walk($arr, function(&$v) {
$v = "CAST(" . $v . " AS VARCHAR(255))";
});
$s = implode('+',$arr);
if (sizeof($arr) > 0) return "$s";
+1 -1
View File
@@ -260,7 +260,7 @@ class ADODB_text extends ADOConnection {
$projnames = array($n);
reset($where_arr);
while (list($k_a,$a) = each($where_arr)) {
foreach ($where_arr as $k_a => $a) {
if ($i == 0 && $this->_skiprow1) {
$projarray[] = array($n);
continue;
+1
View File
@@ -32,5 +32,6 @@ Our changes:
Check if fixed upstream during the next upgrade and remove this note. (8638b3f1441d4b928)
* MDL-58546 replaced each() with foreach for PHP 7.2 compatibility.
pull request upstream: https://github.com/ADOdb/ADOdb/pull/373
* MDL-65920 solved PHP 7.2 deprecations; create_function() and each().
skodak, iarenaza, moodler, stronk7, abgreeve, lameze, ankitagarwal, marinaglancy