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

Merge branch 'MDL-69049-master' of git://github.com/junpataleta/moodle

Browse Source
This commit is contained in:
Víctor Déniz Falcón
2020-06-16 18:05:42 +01:00
parent 3a679810d5 3484f3e4b5
commit f82fad44d7
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/dataprivacy/db/upgrade.php
+22 -6
View File
@@ -322,10 +322,29 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
// Automatically generated Moodle v3.8.0 release upgrade line.
// Put any upgrade step following this.
if ($oldversion < 2019121700) {
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
if ($oldversion < 2020061501) {
// Define field commentsformat to be added to tool_dataprivacy_request.
$table = new xmldb_table('tool_dataprivacy_request');
$field = new xmldb_field('commentsformat', XMLDB_TYPE_INTEGER, '2', null, XMLDB_NOTNULL, null, '0', 'comments');
// Conditionally launch add field commentsformat.
if (!$dbman->field_exists($table, $field)) {
$dbman->add_field($table, $field);
}
// Define field dpocommentformat to be added to tool_dataprivacy_request.
$field = new xmldb_field('dpocommentformat', XMLDB_TYPE_INTEGER, '2', null, XMLDB_NOTNULL, null, '0', 'dpocomment');
// Conditionally launch add field dpocommentformat.
if (!$dbman->field_exists($table, $field)) {
$dbman->add_field($table, $field);
}
// Define field systemapproved to be added to tool_dataprivacy_request.
$table = new xmldb_table('tool_dataprivacy_request');
$field = new xmldb_field('systemapproved', XMLDB_TYPE_INTEGER, '4', null, XMLDB_NOTNULL, null, '0', 'dpocommentformat');
// Conditionally launch add field systemapproved.
@@ -334,11 +353,8 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
}
// Dataprivacy savepoint reached.
upgrade_plugin_savepoint(true, 2019121700, 'tool', 'dataprivacy');
upgrade_plugin_savepoint(true, 2020061501, 'tool', 'dataprivacy');
}
// Automatically generated Moodle v3.9.0 release upgrade line.
// Put any upgrade step following this.
return true;
}
admin/tool/dataprivacy/version.php
+1 -1
View File
@@ -24,6 +24,6 @@
defined('MOODLE_INTERNAL') || die;
$plugin->version = 2020061500;
$plugin->version = 2020061501;
$plugin->requires = 2020060900;
$plugin->component = 'tool_dataprivacy';