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

Merge branch 'MDL-62853' of https://github.com/paulholden/moodle

Browse source
This commit is contained in:
Jake Dallimore 2020-05-25 16:11:55 +08:00
commit 33294da864
2 changed files with 55 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
privacy/classes/local/request/moodle_content_writer.php
View file

@ -139,11 +139,8 @@ class moodle_content_writer implements content_writer {
* @return content_writer
*/
public function export_related_data(array $subcontext, $name, $data) : content_writer {
$path = $this->get_path($subcontext, "{$name}.json");
$this->write_data($path, json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
return $this;
return $this->export_custom_file($subcontext, "{$name}.json",
json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
}
/**
@ -289,6 +286,7 @@ class moodle_content_writer implements content_writer {
// This weird code is to look for a subcontext that contains a number and append an '_' to the front.
// This is because there seems to be some weird problem with array_merge_recursive used in finalise_content().
$subcontext = array_map(function($data) {
$data = clean_param($data, PARAM_PATH);
if (stripos($data, DIRECTORY_SEPARATOR) !== false) {
$newpath = explode(DIRECTORY_SEPARATOR, $data);
$newpath = array_map(function($value) {