moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-64220-35' of git://github.com/damyon/moodle into MOODLE_35_STABLE

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2018-11-27 16:44:25 +01:00
commit 23c05fe9ce
1 changed files with 3 additions and 3 deletions
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); $this->write_data($newshortpath, $variablecontent);
} else { } else {
$treekey[$shortpath] = 'No var'; $treekey[clean_param($shortpath, PARAM_PATH)] = 'No var';
} }
} }
return [$tree, $treekey, $allfiles]; return [$tree, $treekey, $allfiles];
@ -488,11 +488,11 @@ class moodle_content_writer implements content_writer {
$url = clean_param($url, PARAM_PATH); $url = clean_param($url, PARAM_PATH);
$treeleaf->name = $file; $treeleaf->name = $file;
$treeleaf->itemtype = 'item'; $treeleaf->itemtype = 'item';
$gokey = $url . DIRECTORY_SEPARATOR . $file; $gokey = clean_param($url . '/' . $file, PARAM_PATH);
if (isset($treekey[$gokey]) && $treekey[$gokey] !== 'No var') { if (isset($treekey[$gokey]) && $treekey[$gokey] !== 'No var') {
$treeleaf->datavar = $treekey[$gokey]; $treeleaf->datavar = $treekey[$gokey];
} else { } else {
$treeleaf->url = new \moodle_url($url . DIRECTORY_SEPARATOR . $file); $treeleaf->url = new \moodle_url($url . '/' . $file);
} }
}; };