From d88604015a0828e78a05bf7f1ee80bb78f980dae Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 1 Feb 2019 10:34:58 +0100 Subject: No need to emit additonalscript event on public pages There already is a separate event for this. This will make it possible to only inject code with the logged in one on default rendered pages. Signed-off-by: Roeland Jago Douma --- .../AppFramework/Middleware/AdditionalScriptsMiddleware.php | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php') diff --git a/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php b/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php index de1a02026bf..8e5391b4365 100644 --- a/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php +++ b/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php @@ -27,6 +27,7 @@ namespace OC\AppFramework\Middleware; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; use OCP\AppFramework\Middleware; +use OCP\AppFramework\PublicShareController; use OCP\IUserSession; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -42,6 +43,14 @@ class AdditionalScriptsMiddleware extends Middleware { } public function afterController($controller, $methodName, Response $response): Response { + /* + * There is no need to emit these signals on a public share page + * There is a separate event for that already + */ + if ($controller instanceof PublicShareController) { + return $response; + } + if ($response instanceof TemplateResponse) { $this->dispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS); -- cgit v1.2.3