mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-23 17:10:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-61637_master' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2018-05-11 18:09:02 +02:00
commit 614ebf05ea
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/tool/dataprivacy/classes/output/data_registry_page.php
View File

@ -312,29 +312,23 @@ class data_registry_page implements renderable, templatable {
$branches = [];
$blockinstances = \core_block_external::get_course_blocks($coursecontext->instanceid);
if (empty($blockinstances['blocks'])) {
return $branches;
}
$children = $coursecontext->get_child_contexts();
foreach ($children as $childcontext) {
foreach ($blockinstances['blocks'] as $bi) {
if (function_exists('block_instance_by_id')) {
$blockinstance = block_instance_by_id($bi['instanceid']);
} else {
// TODO To be removed when MDL-61621 gets integrated.
$blockinstance = $DB->get_record('block_instances', ['id' => $bi['instanceid']]);
$blockinstance = block_instance($blockinstance->blockname, $blockinstance);
if ($childcontext->contextlevel !== CONTEXT_BLOCK) {
continue;
}
$blockcontext = \context_block::instance($bi['instanceid']);
$displayname = shorten_text(format_string($blockinstance->get_title(), true, ['context' => $blockcontext->id]));
$blockinstance = block_instance_by_id($childcontext->instanceid);
$displayname = shorten_text(format_string($blockinstance->get_title(), true, ['context' => $childcontext]));
$branches[] = self::complete([
'text' => $displayname,
'contextid' => $blockcontext->id,
'contextid' => $childcontext->id,
]);
}
return $branches;
}
/**