Merge branch 'MDL-67712-master' of git://github.com/andrewnicols/moodle

2020-02-17 12:28:05 +01:00
parent 2c0b08c5a7 91434142a4
commit 82ca0e2afd
1 changed files with 4 additions and 2 deletions
@@ -163,8 +163,10 @@ const getComponentFromPath = path => {
 const getOwningComponentDirectory = checkPath => {
    const path = require('path');

-    const pathList = fetchComponentData().components;
-    for (const componentPath of Object.keys(pathList)) {
+    // Fetch all components into a reverse sorted array.
+    // This ensures that components which are within the directory of another component match first.
+    const pathList = Object.keys(fetchComponentData().components).sort().reverse();
+    for (const componentPath of pathList) {
        if (checkPath === componentPath) {
            return componentPath;
        }