mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-20 16:04:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-64220-master' of git://github.com/damyon/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2018-11-27 16:47:10 +01:00
commit d67e734678
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
privacy/classes/local/request/moodle_content_writer.php
View File

@ -453,7 +453,7 @@ class moodle_content_writer implements content_writer {
$this->write_data($newshortpath, $variablecontent);
} else {
$treekey[$shortpath] = 'No var';
$treekey[clean_param($shortpath, PARAM_PATH)] = 'No var';
}
}
return [$tree, $treekey, $allfiles];
@ -488,11 +488,11 @@ class moodle_content_writer implements content_writer {
$url = clean_param($url, PARAM_PATH);
$treeleaf->name = $file;
$treeleaf->itemtype = 'item';
$gokey = $url . DIRECTORY_SEPARATOR . $file;
$gokey = clean_param($url . '/' . $file, PARAM_PATH);
if (isset($treekey[$gokey]) && $treekey[$gokey] !== 'No var') {
$treeleaf->datavar = $treekey[$gokey];
} else {
$treeleaf->url = new \moodle_url($url . DIRECTORY_SEPARATOR . $file);
$treeleaf->url = new \moodle_url($url . '/' . $file);
}
};