diff --git a/admin/tool/dataprivacy/db/upgrade.php b/admin/tool/dataprivacy/db/upgrade.php index e166cf6f666..30a988195a5 100644 --- a/admin/tool/dataprivacy/db/upgrade.php +++ b/admin/tool/dataprivacy/db/upgrade.php @@ -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; } diff --git a/admin/tool/dataprivacy/version.php b/admin/tool/dataprivacy/version.php index 7925e88a031..1df48bcb7f5 100644 --- a/admin/tool/dataprivacy/version.php +++ b/admin/tool/dataprivacy/version.php @@ -24,6 +24,6 @@ defined('MOODLE_INTERNAL') || die; -$plugin->version = 2020061500; +$plugin->version = 2020061501; $plugin->requires = 2020060900; $plugin->component = 'tool_dataprivacy';