Merge branch 'MDL-61801-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE

This commit is contained in:
Eloy Lafuente (stronk7)
2018-04-02 11:04:28 +02:00
@@ -409,7 +409,7 @@ class content_writer implements \core_privacy\local\request\content_writer {
];
}
$this->customfiles[$this->context->id] = array_replace_recursive($this->customfiles[$this->context->id], $finalcontent);
$this->files[$this->context->id] = array_replace_recursive($this->files[$this->context->id], $finalcontent);
}
return $this;