]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #2822 from nextcloud/add-navigation-via-info.xml
authorMorris Jobke <hey@morrisjobke.de>
Fri, 27 Jan 2017 17:25:26 +0000 (11:25 -0600)
committerGitHub <noreply@github.com>
Fri, 27 Jan 2017 17:25:26 +0000 (11:25 -0600)
Add navigation via info.xml (#26785)

1  2 
lib/private/Server.php

index a514534049dfe9d7fa2b1f2bd8819699ebfbbdaf,9d411e5ef9b76a72b3aaa6a8f246949126ae5884..bd8818e9460187ec7b625190058ca13ce4b90e27
@@@ -313,11 -312,15 +313,15 @@@ class Server extends ServerContainer im
                });
  
                $this->registerService(\OC\Authentication\TwoFactorAuth\Manager::class, function (Server $c) {
 -                      return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig());
 +                      return new \OC\Authentication\TwoFactorAuth\Manager($c->getAppManager(), $c->getSession(), $c->getConfig(), $c->getActivityManager(), $c->getLogger());
                });
  
-               $this->registerService('NavigationManager', function ($c) {
-                       return new \OC\NavigationManager();
+               $this->registerService('NavigationManager', function (Server $c) {
+                       return new \OC\NavigationManager($c->getAppManager(),
+                               $c->getURLGenerator(),
+                               $c->getL10NFactory(),
+                               $c->getUserSession(),
+                               $c->getGroupManager());
                });
                $this->registerService('AllConfig', function (Server $c) {
                        return new \OC\AllConfig(