mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6136 from nextcloud/fix_groupmanagement 

Fix group management which was broken since #5847
This commit is contained in:
Joas Schilling 2017-08-16 14:05:48 +02:00 committed by GitHub
parent f0eb882c2e 23039e882f
commit fff192f78f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
settings/Controller/UsersController.php
View File

@ -45,6 +45,7 @@ use OCP\Files\Config\IUserMountCache;
use OCP\Encryption\IEncryptionModule; use OCP\Encryption\IEncryptionModule;
use OCP\Encryption\IManager; use OCP\Encryption\IManager;
use OCP\IConfig; use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IL10N; use OCP\IL10N;
use OCP\ILogger; use OCP\ILogger;
use OCP\IRequest; use OCP\IRequest;
@ -70,7 +71,7 @@ class UsersController extends Controller {
private $isAdmin; private $isAdmin;
/** @var IUserManager */ /** @var IUserManager */
private $userManager; private $userManager;
/** @var \OC\Group\Manager */ /** @var IGroupManager */
private $groupManager; private $groupManager;
/** @var IConfig */ /** @var IConfig */
private $config; private $config;
@ -112,7 +113,7 @@ class UsersController extends Controller {
* @param string $appName * @param string $appName
* @param IRequest $request * @param IRequest $request
* @param IUserManager $userManager * @param IUserManager $userManager
* @param \OC\Group\Manager $groupManager * @param IGroupManager $groupManager
* @param IUserSession $userSession * @param IUserSession $userSession
* @param IConfig $config * @param IConfig $config
* @param bool $isAdmin * @param bool $isAdmin
@ -135,7 +136,7 @@ class UsersController extends Controller {
public function __construct($appName, public function __construct($appName,
IRequest $request, IRequest $request,
IUserManager $userManager, IUserManager $userManager,
\OC\Group\Manager $groupManager, IGroupManager $groupManager,
IUserSession $userSession, IUserSession $userSession,
IConfig $config, IConfig $config,
$isAdmin, $isAdmin,