Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-08-16 15:05:48 +0300
committerGitHub <noreply@github.com>2017-08-16 15:05:48 +0300
commitfff192f78fa9672648ffb1226b682e685f784c5a (patch)
treed9d644e38c3ff7b3f522a183c808d2f9e5337279
parentf0eb882c2e72e1c855ec3ddc0dfe87936babbd76 (diff)
parent23039e882f4d74413f0e4beacada8d9e1333d8d9 (diff)
Merge pull request #6136 from nextcloud/fix_groupmanagement
Fix group management which was broken since #5847
-rw-r--r--settings/Controller/UsersController.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/settings/Controller/UsersController.php b/settings/Controller/UsersController.php
index 4b03cf91a10..cb191441c9a 100644
--- a/settings/Controller/UsersController.php
+++ b/settings/Controller/UsersController.php
@@ -45,6 +45,7 @@ use OCP\Files\Config\IUserMountCache;
use OCP\Encryption\IEncryptionModule;
use OCP\Encryption\IManager;
use OCP\IConfig;
+use OCP\IGroupManager;
use OCP\IL10N;
use OCP\ILogger;
use OCP\IRequest;
@@ -70,7 +71,7 @@ class UsersController extends Controller {
private $isAdmin;
/** @var IUserManager */
private $userManager;
- /** @var \OC\Group\Manager */
+ /** @var IGroupManager */
private $groupManager;
/** @var IConfig */
private $config;
@@ -112,7 +113,7 @@ class UsersController extends Controller {
* @param string $appName
* @param IRequest $request
* @param IUserManager $userManager
- * @param \OC\Group\Manager $groupManager
+ * @param IGroupManager $groupManager
* @param IUserSession $userSession
* @param IConfig $config
* @param bool $isAdmin
@@ -135,7 +136,7 @@ class UsersController extends Controller {
public function __construct($appName,
IRequest $request,
IUserManager $userManager,
- \OC\Group\Manager $groupManager,
+ IGroupManager $groupManager,
IUserSession $userSession,
IConfig $config,
$isAdmin,