diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-10-23 23:31:17 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-10-23 23:31:17 +0200 |
| commit | f884e762bcf3e1737f1cdd5a4453ca0664087b61 (patch) | |
| tree | b0f2ac05efef64c98aac9b21588cc32812cc7acc /settings | |
| parent | db1096bcfdf2336ccf6aefb70dd902a63ed615db (diff) | |
| download | nextcloud-server-f884e762bcf3e1737f1cdd5a4453ca0664087b61.tar.gz nextcloud-server-f884e762bcf3e1737f1cdd5a4453ca0664087b61.zip | |
Use appmanager instead of OC_App for check for enabled app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/users.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/settings/users.php b/settings/users.php index 76c6b5848eb..2d949cb618c 100644 --- a/settings/users.php +++ b/settings/users.php @@ -41,6 +41,7 @@ OC_Util::checkSubAdminUser(); $userManager = \OC::$server->getUserManager(); $groupManager = \OC::$server->getGroupManager(); +$appManager = \OC::$server->getAppManager(); // Set the sort option: SORT_USERCOUNT or SORT_GROUPNAME $sortGroupsBy = \OC\Group\MetaData::SORT_USERCOUNT; @@ -51,7 +52,7 @@ if ($config->getSystemValue('sort_groups_by_name', false)) { $sortGroupsBy = \OC\Group\MetaData::SORT_GROUPNAME; } else { $isLDAPUsed = false; - if (\OC_App::isEnabled('user_ldap')) { + if ($appManager->isEnabledForUser('user_ldap')) { $isLDAPUsed = $groupManager->isBackendUsed('\OCA\User_LDAP\Group_LDAP') || $groupManager->isBackendUsed('\OCA\User_LDAP\Group_Proxy'); @@ -76,7 +77,7 @@ $groupsInfo = new \OC\Group\MetaData( $groupsInfo->setSorting($sortGroupsBy); list($adminGroup, $groups) = $groupsInfo->get(); -$recoveryAdminEnabled = OC_App::isEnabled('encryption') && +$recoveryAdminEnabled = $appManager->isEnabledForUser('encryption') && $config->getAppValue( 'encryption', 'recoveryAdminEnabled', '0'); if($isAdmin) { |