diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-01 14:05:40 +0300 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-02 23:25:05 +0300 |
| commit | eebe2b9c239a7f9e7e127f52ab4b9e97763b0149 (patch) | |
| tree | 81d9d855b7b6e0d5fb387cd5e8c6092f17e21de3 /settings/controller | |
| parent | df5872ec50a68de5d99bd6b5cf17ceb94f2ef833 (diff) | |
User IUser::getEMailAddress() all over the place
Diffstat (limited to 'settings/controller')
| -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, ]; } |