summaryrefslogtreecommitdiffstats
path: root/lib/private/AppFramework/Middleware
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2019-11-20 10:33:45 +0100
committerGitHub <noreply@github.com>2019-11-20 10:33:45 +0100
commit6ad54f3f27298a8f2f62fba67344a529f071510f (patch)
tree60e2a65ccc5efc80a82a8650c61311fe58e6406c /lib/private/AppFramework/Middleware
parentc4ef32f4f0e364ec457e193d094a92696858d572 (diff)
parent9055f46351bba23b31d966251486a2b2d47bbdd0 (diff)
downloadnextcloud-server-6ad54f3f27298a8f2f62fba67344a529f071510f.tar.gz
nextcloud-server-6ad54f3f27298a8f2f62fba67344a529f071510f.zip
Merge pull request #17850 from nextcloud/bugfix/noid/mark-spreed-as-active-on-call-urls
Mark "Talk" active on /call/token URLs
Diffstat (limited to 'lib/private/AppFramework/Middleware')
-rw-r--r--lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
index fc92bea3dc1..db3157bda64 100644
--- a/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
+++ b/lib/private/AppFramework/Middleware/Security/SecurityMiddleware.php
@@ -116,6 +116,8 @@ class SecurityMiddleware extends Middleware {
* @param Controller $controller the controller
* @param string $methodName the name of the method
* @throws SecurityException when a security check fails
+ *
+ * @suppress PhanUndeclaredClassConstant
*/
public function beforeController($controller, $methodName) {
@@ -123,6 +125,10 @@ class SecurityMiddleware extends Middleware {
// for normal HTML requests and not for AJAX requests
$this->navigationManager->setActiveEntry($this->appName);
+ if ($controller === \OCA\Talk\Controller\PageController::class && $methodName === 'showCall') {
+ $this->navigationManager->setActiveEntry('spreed');
+ }
+
// security checks
$isPublicPage = $this->reflector->hasAnnotation('PublicPage');
if(!$isPublicPage) {