Merge branch 'wip-MDL-41772-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

mod/data/backup/moodle2/restore_data_activity_task.class.php

@@ -120,4 +120,19 @@ class restore_data_activity_task extends restore_activity_task {
 
         return $rules;
     }
+
+    /**
+     * Given a commment area, return the itemname that contains the itemid mappings.
+     *
+     * @param string $commentarea Comment area name e.g. database_entry.
+     * @return string name of the mapping used to determine the itemid.
+     */
+    public function get_comment_mapping_itemname($commentarea) {
+        if ($commentarea == 'database_entry') {
+            $itemname = 'data_record';
+        } else {
+            $itemname = parent::get_comment_mapping_itemname($commentarea);
+        }
+        return $itemname;
+    }
 }