diff options
Diffstat (limited to 'appinfo/application.php')
| -rw-r--r-- | appinfo/application.php | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/appinfo/application.php b/appinfo/application.php index d80498a4a..f8c2bc7fa 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -29,7 +29,6 @@ use \OCA\News\Controller\UtilityApiController; use \OCA\News\Controller\FolderApiController; use \OCA\News\Controller\FeedApiController; use \OCA\News\Controller\ItemApiController; -use \OCA\News\Controller\AppController; use \OCA\News\Service\FolderService; use \OCA\News\Service\FeedService; @@ -79,6 +78,8 @@ class Application extends App { $c->query('AppName'), $c->query('Request'), $c->query('CoreConfig'), + $c->query('URLGenerator'), + $c->query('AppConfig'), $c->query('L10N'), $c->query('UserId') ); @@ -170,15 +171,6 @@ class Application extends App { ); }); - $container->registerService('AppController', function($c) { - return new AppController( - $c->query('AppName'), - $c->query('Request'), - $c->query('ServerContainer')->getURLGenerator(), - $c->query('AppConfig') - ); - }); - /** * Business Layer */ @@ -271,7 +263,7 @@ class Application extends App { $config = new AppConfig( $c->query('ServerContainer')->getNavigationManager(), $c->query('L10N'), - $c->query('ServerContainer')->getURLGenerator(), + $c->query('URLGenerator'), phpversion(), implode('.', Util::getVersion()), $extensions, @@ -290,6 +282,10 @@ class Application extends App { return $c->query('ServerContainer')->getL10N($c->query('AppName')); }); + $container->registerService('URLGenerator', function($c) { + return $c->query('ServerContainer')->getURLGenerator(); + }); + $container->registerService('UserId', function() { return User::getUser(); }); |