diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-01 12:05:40 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-02 21:25:05 +0100 |
| commit | eebe2b9c239a7f9e7e127f52ab4b9e97763b0149 (patch) | |
| tree | 81d9d855b7b6e0d5fb387cd5e8c6092f17e21de3 /lib/private/ocs | |
| parent | df5872ec50a68de5d99bd6b5cf17ceb94f2ef833 (diff) | |
| download | nextcloud-server-eebe2b9c239a7f9e7e127f52ab4b9e97763b0149.tar.gz nextcloud-server-eebe2b9c239a7f9e7e127f52ab4b9e97763b0149.zip | |
User IUser::getEMailAddress() all over the place
Diffstat (limited to 'lib/private/ocs')
| -rw-r--r-- | lib/private/ocs/cloud.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/ocs/cloud.php b/lib/private/ocs/cloud.php index 0d93819b9e4..2cf40c449ff 100644 --- a/lib/private/ocs/cloud.php +++ b/lib/private/ocs/cloud.php @@ -41,11 +41,11 @@ class OC_OCS_Cloud { } public static function getCurrentUser() { - $email=\OC::$server->getConfig()->getUserValue(OC_User::getUser(), 'settings', 'email', ''); + $userObject = \OC::$server->getUserManager()->get(OC_User::getUser()); $data = array( - 'id' => OC_User::getUser(), - 'display-name' => OC_User::getDisplayName(), - 'email' => $email, + 'id' => $userObject->getUID(), + 'display-name' => $userObject->getDisplayName(), + 'email' => $userObject->getEMailAddress(), ); return new OC_OCS_Result($data); } |