diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-07-10 00:06:22 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-07-10 00:06:22 +0200 |
| commit | a735105a224e83f502e1d49366509e2afa2989b4 (patch) | |
| tree | 8e5a0faf8e362a0b8788834935897faf4b33f4a3 /lib/user | |
| parent | 244d376a16c1ec6e4fd190aa75adaad3a10af5e1 (diff) | |
| download | nextcloud-server-a735105a224e83f502e1d49366509e2afa2989b4.tar.gz nextcloud-server-a735105a224e83f502e1d49366509e2afa2989b4.zip | |
update group management
Diffstat (limited to 'lib/user')
| -rw-r--r-- | lib/user/manager.php | 3 | ||||
| -rw-r--r-- | lib/user/user.php | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/user/manager.php b/lib/user/manager.php index d17cdf1a200..8dc9bfe2729 100644 --- a/lib/user/manager.php +++ b/lib/user/manager.php @@ -30,6 +30,9 @@ class Manager extends PublicEmitter { */ private $backends = array(); + /** + * @var \OC\User\User[] $cachedUsers + */ private $cachedUsers = array(); public function __construct() { 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; |