diff --git a/apps/files_external/lib/Service/BackendService.php b/apps/files_external/lib/Service/BackendService.php index 167b1017b02e1a5db4f873fe9b2f3d2369a410ea..adfe6b0a9c3cc9584a49feaf414486ca7f0811bb 100644 --- a/apps/files_external/lib/Service/BackendService.php +++ b/apps/files_external/lib/Service/BackendService.php @@ -30,6 +30,7 @@ use OCA\Files_External\Lib\Auth\AuthMechanism; use OCA\Files_External\Lib\Backend\Backend; use OCA\Files_External\Lib\Config\IAuthMechanismProvider; use OCA\Files_External\Lib\Config\IBackendProvider; +use OCP\EventDispatcher\GenericEvent; use OCP\IConfig; /** @@ -110,7 +111,8 @@ class BackendService { static $eventSent = false; if(!$eventSent) { \OC::$server->getEventDispatcher()->dispatch( - 'OCA\\Files_External::loadAdditionalBackends' + 'OCA\\Files_External::loadAdditionalBackends', + new GenericEvent() ); $eventSent = true; } diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index fdff5d36c76a76e859e71cd1335d1cf7873c7cbe..bde3ddd95e79d063d48d85b0574fdb1a00793207 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -21,6 +21,7 @@ */ use OCA\Files\Event\LoadAdditionalScriptsEvent; use OCA\Files\Event\LoadSidebar; +use OCP\EventDispatcher\GenericEvent; // Check if we are a user OCP\User::checkLoggedIn(); @@ -37,7 +38,7 @@ $tmpl = new OCP\Template('files_sharing', 'list', ''); $tmpl->assign('showgridview', $showgridview && !$isIE); // fire script events -$eventDispatcher->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts'); +$eventDispatcher->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts', new GenericEvent()); $eventDispatcher->dispatch(LoadAdditionalScriptsEvent::class, new LoadAdditionalScriptsEvent()); $eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar()); diff --git a/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php b/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php index 3ab084cd8946245910a15a613a12283043a1ec17..c65f8f8493ad4b3bfa8815b52d94490ce4fafb08 100644 --- a/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php +++ b/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php @@ -29,6 +29,7 @@ use OCP\AppFramework\Http\StandaloneTemplateResponse; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Middleware; use OCP\AppFramework\PublicShareController; +use OCP\EventDispatcher\GenericEvent; use OCP\IUserSession; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -53,10 +54,10 @@ class AdditionalScriptsMiddleware extends Middleware { } if ($response instanceof TemplateResponse) { - $this->dispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS); + $this->dispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS, new GenericEvent()); if (!($response instanceof StandaloneTemplateResponse) && $this->userSession->isLoggedIn()) { - $this->dispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN); + $this->dispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN, new GenericEvent()); } }