diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-03 09:21:53 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-03 09:21:53 +0100 |
| commit | 7fefd4f4d900de85201dafd9848f1212d4f6176d (patch) | |
| tree | 20d275d6ebe8d4cc52ce50d3b339bb4f4ffa5c5a /settings/controller/userscontroller.php | |
| parent | 6b4f48e0f3ffc7e2f243b232289f7d54a4f8fad5 (diff) | |
| parent | dcc7ff09ba4cfba6fe200f4f686cca7a1853390c (diff) | |
| download | nextcloud-server-7fefd4f4d900de85201dafd9848f1212d4f6176d.tar.gz nextcloud-server-7fefd4f4d900de85201dafd9848f1212d4f6176d.zip | |
Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the-place
User IUser::getEMailAddress() all over the place
Diffstat (limited to 'settings/controller/userscontroller.php')
| -rw-r--r-- | settings/controller/userscontroller.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php index 942319901f3..827f74c4c83 100644 --- a/settings/controller/userscontroller.php +++ b/settings/controller/userscontroller.php @@ -164,6 +164,10 @@ class UsersController extends Controller { $subAdminGroups[$key] = $subAdminGroup->getGID(); } + $displayName = $user->getEMailAddress(); + if (is_null($displayName)) { + $displayName = ''; + } return [ 'name' => $user->getUID(), 'displayname' => $user->getDisplayName(), @@ -173,7 +177,7 @@ class UsersController extends Controller { 'storageLocation' => $user->getHome(), 'lastLogin' => $user->getLastLogin() * 1000, 'backend' => $user->getBackendClassName(), - 'email' => $this->config->getUserValue($user->getUID(), 'settings', 'email', ''), + 'email' => $displayName, 'isRestoreDisabled' => !$restorePossible, ]; } |