Merge pull request #135 from catalyst/issue134

Fix issue #134 Add valuetrust from MDL-79256

Author: dmitriim

classes/customfield/cms_restore.php

@@ -37,6 +37,7 @@ trait cms_restore {
      * @throws \moodle_exception
      */
     public function cms_restore_instance_data_from_backup(\restore_task $task, array $data, int $instanceid) {
+        global $DB;
         $context = $this->get_instance_context($instanceid);
         $editablefields = $this->get_editable_fields($instanceid);
         $records = api::get_instance_fields_data($editablefields, $instanceid);
@@ -51,6 +52,9 @@ public function cms_restore_instance_data_from_backup(\restore_task $task, array
                     $d->set('value', $data['value']);
                     $d->set('valueformat', $data['valueformat']);
                     $d->set('contextid', $context->id);
+                    if ($DB->get_manager()->field_exists('customfield_data', 'valuetrust')) {
+                        $d->set('valuetrust', !empty($data['valuetrust']));
+                    }
                     $d->save();
                 }
                 return $d->get('id');

classes/local/datasource/fields.php

@@ -245,8 +245,13 @@ public function instance_on_delete() {
      * @param \backup_nested_element $parent
      */
     public function instance_backup_define_structure(\backup_nested_element $parent) {
+        global $DB;
         $fields = new \backup_nested_element('fields');
-        $field = new \backup_nested_element('field', ['id'], ['shortname', 'type', 'value', 'valueformat']);
+        if ($DB->get_manager()->field_exists('customfield_data', 'valuetrust')) {
+            $field = new \backup_nested_element('field', ['id'], ['shortname', 'type', 'value', 'valueformat', 'valuetrust']);
+        } else {
+            $field = new \backup_nested_element('field', ['id'], ['shortname', 'type', 'value', 'valueformat']);
+        }
 
         $parent->add_child($fields);
         $fields->add_child($field);

classes/local/datasource/userlist.php

@@ -512,6 +512,7 @@ public function config_backup_define_structure(\backup_nested_element $element)
      * @param \backup_nested_element $parent
      */
     public function instance_backup_define_structure(\backup_nested_element $parent) {
+        global $DB;
         $userlist = new \backup_nested_element('userlist');
         $parent->add_child($userlist);
 
@@ -521,7 +522,11 @@ public function instance_backup_define_structure(\backup_nested_element $parent)
         $rows->add_child($row);
 
         $fields = new \backup_nested_element('userlistfields');
-        $field = new \backup_nested_element('userlistfield', ['id'], ['shortname', 'type', 'value', 'valueformat']);
+        if ($DB->get_manager()->field_exists('customfield_data', 'valuetrust')) {
+            $field = new \backup_nested_element('userlistfield', ['id'], ['shortname', 'type', 'value', 'valueformat', 'valuetrust']);
+        } else {
+            $field = new \backup_nested_element('userlistfield', ['id'], ['shortname', 'type', 'value', 'valueformat']);
+        }
         $userlist->add_child($fields);
         $fields->add_child($field);