From 2164e59e3a562399d3329a483c6f318101fa50b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 9 Feb 2021 13:52:27 +0100
Subject: [PATCH] Make sure that collections scripts event is properly emitted
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 lib/Controller/PageController.php | 1 +
 templates/index.php               | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 7174d5278003..8a5e3be2ee25 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -255,6 +255,7 @@ public function index(string $token = '', string $callUser = '', string $passwor
 			$this->eventDispatcher->dispatchTyped(new LoadViewer());
 		}
 
+		$this->eventDispatcher->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts', new GenericEvent());
 		$response = new TemplateResponse($this->appName, 'index');
 		$csp = new ContentSecurityPolicy();
 		$csp->addAllowedConnectDomain('*');
diff --git a/templates/index.php b/templates/index.php
index b3949fe93c89..5a9abb765f61 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,11 +1,6 @@
 <?php
 
-/** @var \OCP\IL10N $l */
-/** @var array $_ */
+declare(strict_types=1);
 
 script('spreed', 'talk');
-
 style('spreed', 'merged');
-if (($_['user_uid'] ?? '') !== '') {
-	\OC::$server->getEventDispatcher()->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts');
-}