wip

andrewnicols · Apr 1, 2024 · e711e36 · e711e36
1 parent e592ad4
commit e711e36
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/moodle/Util/MoodleUtil.php b/moodle/Util/MoodleUtil.php
@@ -239,6 +239,7 @@ public static function getMoodleComponent(File $file, $selfPath = true): ?string
             $components = self::calculateAllComponents($moodleRoot);
             // Have been unable to load components, done.
             if (empty($components)) {
+                error_log("No components found");
                 return null;
             }
         }
@@ -249,8 +250,11 @@ public static function getMoodleComponent(File $file, $selfPath = true): ?string
             if (empty($componentPath)) {
                 continue;
             }
+
+            $componentPath = str_replace('\\', '/', $componentPath . DIRECTORY_SEPARATOR);
+
             // Look for component paths matching the file path.
-            if (strpos($file->path, $componentPath . DIRECTORY_SEPARATOR) === 0) {
+            if (strpos(MoodleUtil::getStandardisedFilename($file), $componentPath . DIRECTORY_SEPARATOR) === 0) {
                 // First match found should be the better one always. We are done.
                 return $component;
             }