L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-79511-402' of https://github.com/meirzamoodle/moodle into MOODLE_402_STABLE

Browse Source
This commit is contained in:
Sara Arjona
2023-09-28 16:15:53 +02:00
parent a3dfbe4b93 cef7d8c2ed
commit e09f12a07a
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auth/db/auth.php
+1 -3
View File
@@ -760,9 +760,7 @@ class auth_plugin_db extends auth_plugin_base {
$rs->close();
} else {
$fields_obj = $rs->FetchObj();
$columns = array_keys((array)$fields_obj);
$columns = array_keys($rs->fetchRow());
echo $OUTPUT->notification(get_string('auth_dbcolumnlist', 'auth_db', implode(', ', $columns)), 'notifysuccess');
$rs->close();
}
enrol/database/lib.php
+2 -6
View File
@@ -1042,9 +1042,7 @@ class enrol_database_plugin extends enrol_plugin {
$rs->Close();
} else {
$fields_obj = $rs->FetchObj();
$columns = array_keys((array)$fields_obj);
$columns = array_keys($rs->fetchRow());
echo $OUTPUT->notification('External enrolment table contains following columns:<br />'.implode(', ', $columns), 'notifysuccess');
$rs->Close();
}
@@ -1061,9 +1059,7 @@ class enrol_database_plugin extends enrol_plugin {
$rs->Close();
} else {
$fields_obj = $rs->FetchObj();
$columns = array_keys((array)$fields_obj);
$columns = array_keys($rs->fetchRow());
echo $OUTPUT->notification('External course table contains following columns:<br />'.implode(', ', $columns), 'notifysuccess');
$rs->Close();
}
lib/adodb/adodb.inc.php
+1
View File
@@ -3744,6 +3744,7 @@ http://www.stanford.edu/dept/itss/docs/oracle/10g/server.101/b10759/statements_1
/**
* Internal placeholder for record objects. Used by ADORecordSet->FetchObj().
*/
#[AllowDynamicProperties]
class ADOFetchObj {
};
lib/adodb/readme_moodle.txt
+2 -1
View File
@@ -35,4 +35,5 @@ Notes:
4. https://github.com/ADOdb/ADOdb/commit/5766f6b17aac1da80302840416e24ac9a341742c
5. https://github.com/ADOdb/ADOdb/commit/f52cf8a68cb6e0b702c8e7a6a8fa5da3e59ad13a
6. https://github.com/ADOdb/ADOdb/commit/f7b91c2a45e2c89868894f73a65a096fbc4c1a0f
Some of the commits added properties and removed some codes to avoid adding new properties.
Some of the commits added properties and removed some codes to avoid adding new properties.
* 2023-09-28 Added #[AllowDynamicProperties] above the ADOFetchObj class.