diff options
Diffstat (limited to 'lib/public/Util.php')
| -rw-r--r-- | lib/public/Util.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/public/Util.php b/lib/public/Util.php index b839318303a..cd6f5f34a69 100644 --- a/lib/public/Util.php +++ b/lib/public/Util.php @@ -228,7 +228,12 @@ class Util { $sortedScripts = $scriptSort->sort(self::$scripts, self::$scriptDeps); // Flatten array and remove duplicates - return $sortedScripts ? array_unique(array_merge(...array_values(($sortedScripts)))) : []; + $sortedScripts = $sortedScripts ? array_merge(...array_values(($sortedScripts))) : []; + + // Override core-common and core-main order + array_unshift($sortedScripts, 'core/js/common', 'core/js/main'); + + return array_unique($sortedScripts); } /** |