don't always add core/common and core/main during "sorting"

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/core/Listener/BeforeTemplateRenderedListener.php b/core/Listener/BeforeTemplateRenderedListener.php
index c453d010a4c5b527f49fb4591c075ac2e6886244..95adfc61ad95916ba3227193ed4531ae3d51f91a 100644 (file)
--- a/core/Listener/BeforeTemplateRenderedListener.php
+++ b/core/Listener/BeforeTemplateRenderedListener.php
@@ -49,6 +49,12 @@ class BeforeTemplateRenderedListener implements IEventListener {
 
                \OC_Util::addStyle('server', null, true);
 
+               if ($event instanceof BeforeLoginTemplateRenderedEvent) {
+                       // todo: make login work without these
+                       Util::addScript('core', 'common');
+                       Util::addScript('core', 'main');
+               }
+
                if ($event instanceof BeforeTemplateRenderedEvent) {
                        // include common nextcloud webpack bundle
                        Util::addScript('core', 'common');

diff --git a/lib/public/Util.php b/lib/public/Util.php
index 63ed9e835c77059b8b98479a62f289f0884e2358..1d03c35a9b7a9e797b9bfc00ac150e6c8f288b07 100644 (file)
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -212,7 +212,12 @@ class Util {
                $sortedScripts = $sortedScripts ? array_merge(...array_values(($sortedScripts))) : [];
 
                // Override core-common and core-main order
-               array_unshift($sortedScripts, 'core/js/common', 'core/js/main');
+               if (in_array('core/js/main', $sortedScripts)) {
+                       array_unshift($sortedScripts, 'core/js/main');
+               }
+               if (in_array('core/js/common', $sortedScripts)) {
+                       array_unshift($sortedScripts, 'core/js/common');
+               }
 
                return array_unique($sortedScripts);
        }