From ff015b5f7a2232ce8fdebceb575da92c89001201 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 27 Nov 2018 09:42:53 +0800
Subject: [PATCH] MDL-64220 privacy: Clean path params

We need to consistently clean the path params before we use them. This
shows a difference on windows where dir separators are different.
---
 privacy/classes/local/request/moodle_content_writer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/privacy/classes/local/request/moodle_content_writer.php b/privacy/classes/local/request/moodle_content_writer.php
index 0d614c0feeb..5ba00a61b64 100644
--- a/privacy/classes/local/request/moodle_content_writer.php
+++ b/privacy/classes/local/request/moodle_content_writer.php
@@ -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);
             }
         };