Skip to content

Commit

Permalink
Merge pull request #17850 from nextcloud/bugfix/noid/mark-spreed-as-a…
Browse files Browse the repository at this point in the history
…ctive-on-call-urls

Mark "Talk" active on /call/token URLs
  • Loading branch information
nickvergessen authored Nov 20, 2019
2 parents c4ef32f + 9055f46 commit 6ad54f3
Showing 1 changed file with 6 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,19 @@ public function __construct(IRequest $request,
* @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) {

// this will set the current navigation entry of the app, use this only
// 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) {
Expand Down

0 comments on commit 6ad54f3

Please sign in to comment.