diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2018-06-27 19:09:09 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2018-06-27 21:52:04 +0200 |
| commit | 3ffeb4ae060d97b9306a2c243332d3a137b1e464 (patch) | |
| tree | 0cbe689220d3d40038f96feffa017e33fb5c5829 /apps/provisioning_api/lib/Controller | |
| parent | 0cacdd3132d7f82801038efd5117e1629c97e749 (diff) | |
| download | nextcloud-server-3ffeb4ae060d97b9306a2c243332d3a137b1e464.tar.gz nextcloud-server-3ffeb4ae060d97b9306a2c243332d3a137b1e464.zip | |
fix tests / mistakes made during rebase
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Diffstat (limited to 'apps/provisioning_api/lib/Controller')
| -rw-r--r-- | apps/provisioning_api/lib/Controller/AUserData.php | 1 | ||||
| -rw-r--r-- | apps/provisioning_api/lib/Controller/UsersController.php | 13 |
2 files changed, 1 insertions, 13 deletions
diff --git a/apps/provisioning_api/lib/Controller/AUserData.php b/apps/provisioning_api/lib/Controller/AUserData.php index 2e29cc1df12..f08fef91417 100644 --- a/apps/provisioning_api/lib/Controller/AUserData.php +++ b/apps/provisioning_api/lib/Controller/AUserData.php @@ -123,6 +123,7 @@ abstract class AUserData extends OCSController { $data[AccountManager::PROPERTY_TWITTER] = $userAccount[AccountManager::PROPERTY_TWITTER]['value']; $data['groups'] = $gids; $data['language'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'lang'); + $data['locale'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'locale'); return $data; } diff --git a/apps/provisioning_api/lib/Controller/UsersController.php b/apps/provisioning_api/lib/Controller/UsersController.php index 8b39de29086..52021ec2486 100644 --- a/apps/provisioning_api/lib/Controller/UsersController.php +++ b/apps/provisioning_api/lib/Controller/UsersController.php @@ -392,19 +392,6 @@ class UsersController extends AUserData { } } - // Find the data - $data['id'] = $targetUserObject->getUID(); - $data['quota'] = $this->fillStorageInfo($targetUserObject->getUID()); - $data[AccountManager::PROPERTY_EMAIL] = $targetUserObject->getEMailAddress(); - $data[AccountManager::PROPERTY_DISPLAYNAME] = $targetUserObject->getDisplayName(); - $data[AccountManager::PROPERTY_PHONE] = $userAccount[AccountManager::PROPERTY_PHONE]['value']; - $data[AccountManager::PROPERTY_ADDRESS] = $userAccount[AccountManager::PROPERTY_ADDRESS]['value']; - $data[AccountManager::PROPERTY_WEBSITE] = $userAccount[AccountManager::PROPERTY_WEBSITE]['value']; - $data[AccountManager::PROPERTY_TWITTER] = $userAccount[AccountManager::PROPERTY_TWITTER]['value']; - $data['groups'] = $gids; - $data['language'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'lang'); - $data['locale'] = $this->config->getUserValue($targetUserObject->getUID(), 'core', 'locale'); - return new DataResponse($permittedFields); } |