Merge pull request #5105 from nextcloud/bugfix/noid/collections

Make sure that project resources scripts event is properly emitted
nextcloud · Feb 12, 2021 · 69c9a7e · 69c9a7e
2 parents 1cfb072 + 86d7798
commit 69c9a7e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -44,6 +44,7 @@
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\Template\PublicTemplateResponse;
 use OCP\AppFramework\Services\IInitialState;
+use OCP\EventDispatcher\GenericEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
 use OCP\ICacheFactory;
@@ -255,6 +256,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
@@ -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');
-}