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

Merge branch 'MDL-70010' of https://github.com/stronk7/moodle

Browse Source
This commit is contained in:
Jake Dallimore
2020-10-28 11:07:19 +08:00
parent d59487ded3 0dbeb9748b
commit 62e5852f36
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+15 -15
View File
@@ -2543,21 +2543,6 @@ function xmldb_main_upgrade($oldversion) {
}
if ($oldversion < 2021052500.01) {
// Define field timecreated to be added to task_adhoc.
$table = new xmldb_table('task_adhoc');
$field = new xmldb_field('timecreated', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'blocking');
// Conditionally launch add field timecreated.
if (!$dbman->field_exists($table, $field)) {
$dbman->add_field($table, $field);
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2021052500.01);
}
if ($oldversion < 2021052500.02) {
// Delete all user evidence files from users that have been deleted.
$sql = "SELECT DISTINCT f.*
FROM {files} f
@@ -2572,6 +2557,21 @@ function xmldb_main_upgrade($oldversion) {
$fs->get_file_instance($stalefile)->delete();
}
upgrade_main_savepoint(true, 2021052500.01);
}
if ($oldversion < 2021052500.02) {
// Define field timecreated to be added to task_adhoc.
$table = new xmldb_table('task_adhoc');
$field = new xmldb_field('timecreated', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'blocking');
// Conditionally launch add field timecreated.
if (!$dbman->field_exists($table, $field)) {
$dbman->add_field($table, $field);
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2021052500.02);
}
lib/phpunit/classes/phpunit_dataset.php
+1 -1
View File
@@ -98,7 +98,7 @@ class phpunit_dataset {
*
* @param string $content contents (CSV or XML) to load.
* @param string $type format of the content to be loaded (csv or xml).
* @param string $table|null name of the table which the file belongs to (only for CSV files).
* @param string|null $table name of the table which the file belongs to (only for CSV files).
*/
public function from_string(string $content, string $type, ?string $table = null): void {
switch ($type) {