Merge branch 'MDL-66502-master' of git://github.com/junpataleta/moodle

2019-09-10 09:35:08 +08:00
parent 259467d283 f3847964b6
commit 95d3a87dd4
1 changed files with 1 additions and 1 deletions
@@ -121,7 +121,7 @@ class core_requirejs {
                $extension = $item->getExtension();
                if ($extension === 'js') {
                    $filename = substr($item->getRealpath(), strlen($srcdir) + 1);
-                    $filename = str_replace('.min', '', $filename);
+                    $filename = preg_replace('/(\.min)?\.js$/', '', $filename);
                    // We skip lazy loaded modules unless specifically requested.
                    if ($includelazy || strpos($filename, '-lazy') === false) {
                        $modulename = $component . '/' . $filename;