diff options
Diffstat (limited to 'settings/application.php')
| -rw-r--r-- | settings/application.php | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/settings/application.php b/settings/application.php index 155cc39d041..c876065fffa 100644 --- a/settings/application.php +++ b/settings/application.php @@ -36,7 +36,6 @@ use OC\Settings\Controller\LogSettingsController; use OC\Settings\Controller\MailSettingsController; use OC\Settings\Controller\SecuritySettingsController; use OC\Settings\Controller\UsersController; -use OC\Settings\Factory\SubAdminFactory; use OC\Settings\Middleware\SubadminMiddleware; use \OCP\AppFramework\App; use OCP\IContainer; @@ -136,8 +135,7 @@ class Application extends App { $c->query('Mailer'), $c->query('DefaultMailAddress'), $c->query('URLGenerator'), - $c->query('OCP\\App\\IAppManager'), - $c->query('SubAdminFactory') + $c->query('OCP\\App\\IAppManager') ); }); $container->registerService('LogSettingsController', function(IContainer $c) { @@ -199,11 +197,12 @@ class Application extends App { }); /** FIXME: Remove once OC_SubAdmin is non-static and mockable */ $container->registerService('IsSubAdmin', function(IContainer $c) { - return \OC_Subadmin::isSubAdmin(\OC_User::getUser()); - }); - /** FIXME: Remove once OC_SubAdmin is non-static and mockable */ - $container->registerService('SubAdminFactory', function(IContainer $c) { - return new SubAdminFactory(); + $userObject = \OC::$server->getUserSession()->getUser(); + $isSubAdmin = false; + if($userObject !== null) { + $isSubAdmin = \OC::$server->getGroupManager()->getSubAdmin()->isSubAdmin($userObject); + } + return $isSubAdmin; }); $container->registerService('Mailer', function(IContainer $c) { return $c->query('ServerContainer')->getMailer(); |