L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-62251 Privacy: Url path separator should be platform independant

Browse Source 
It should always be forward slash.
This commit is contained in:
Shamim Rezaie
2018-05-11 17:31:23 +10:00
parent b561a9a3c2
commit 6d882faecf
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
privacy/classes/local/request/moodle_content_writer.php
+20 -1
View File
@@ -162,7 +162,7 @@ class moodle_content_writer implements content_writer {
* @return string The processed string
*/
public function rewrite_pluginfile_urls(array $subcontext, $component, $filearea, $itemid, $text) : string {
return str_replace('@@PLUGINFILE@@/', $this->get_files_target_path($component, $filearea, $itemid).'/', $text);
return str_replace('@@PLUGINFILE@@/', $this->get_files_target_url($component, $filearea, $itemid).'/', $text);
}
/**
@@ -318,6 +318,25 @@ class moodle_content_writer implements content_writer {
return implode(DIRECTORY_SEPARATOR, $parts);
}
/**
* Get a relative url to the directory of the exported files within a subcontext.
*
* @param string $component The name of the component that the files belong to.
* @param string $filearea The filearea within that component.
* @param string $itemid Which item those files belong to.
* @return string The url
*/
protected function get_files_target_url($component, $filearea, $itemid) : string {
// We do not need to include the component because we organise things by context.
$parts = ['_files', $filearea];
if (!empty($itemid)) {
$parts[] = $itemid;
}
return implode('/', $parts);
}
/**
* Write the data to the specified path.
*