diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-30 00:37:05 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-30 00:37:05 +0200 |
| commit | f658852276204fbf1a76d58ac2f585cf9db8c75d (patch) | |
| tree | 5fbd6d93c7435022e8539065a45469bd249799ad /lib/user/user.php | |
| parent | 085fdfec2f298fd89d0265d0f97edfdda5a12954 (diff) | |
| parent | 7c6246fa451c4646dfaa1396dd37e0b3eb9706ba (diff) | |
| download | nextcloud-server-f658852276204fbf1a76d58ac2f585cf9db8c75d.tar.gz nextcloud-server-f658852276204fbf1a76d58ac2f585cf9db8c75d.zip | |
Merge branch 'master' into fixing-testGetById-master
Diffstat (limited to 'lib/user/user.php')
| -rw-r--r-- | lib/user/user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/user/user.php b/lib/user/user.php index 55d7848a979..8115c43198c 100644 --- a/lib/user/user.php +++ b/lib/user/user.php @@ -44,7 +44,7 @@ class User { */ public function __construct($uid, $backend, $emitter = null) { $this->uid = $uid; - if ($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) { + if ($backend and $backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) { $this->displayName = $backend->getDisplayName($uid); } else { $this->displayName = $uid; |