Merge branch 'MDL-55133-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE

2016-07-12 13:16:40 +02:00
parent c4312f0ac7 2c72d1b8b5
commit a59d8bfdcb
2 changed files with 96 additions and 1 deletions
@@ -90,7 +90,7 @@ class core_requirejs {
        $subsystems = core_component::get_core_subsystems();
        foreach ($subsystems as $subsystem => $dir) {
            if (!empty($dir) && is_dir($dir . '/amd')) {
-                $jsdirs[$subsystem] = $dir . '/amd';
+                $jsdirs['core_' . $subsystem] = $dir . '/amd';
            }
        }
        $plugintypes = core_component::get_plugin_types();