Merge pull request #590 from nextcloud/fixing-undefined-OfflineUser-c…

…omposeAndStoreDisplayName Fix undefined OfflineUser::composeAndStoreDisplayName()
nextcloud · Jul 28, 2016 · 83c64f3 · 83c64f3
2 parents bf7afcd + 1177c70
commit 83c64f3
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/apps/user_ldap/lib/User_LDAP.php b/apps/user_ldap/lib/User_LDAP.php
@@ -395,8 +395,14 @@ public function getDisplayName($uid) {
 			}
 
 			$user = $this->access->userManager->get($uid);
-			$displayName = $user->composeAndStoreDisplayName($displayName, $displayName2);
-			$this->access->connection->writeToCache($cacheKey, $displayName);
+			if ($user instanceof User) {
+				$displayName = $user->composeAndStoreDisplayName($displayName, $displayName2);
+				$this->access->connection->writeToCache($cacheKey, $displayName);
+			}
+			if ($user instanceof OfflineUser) {
+				/** @var OfflineUser $user*/
+				$displayName = $user->getDisplayName();
+			}
 			return $displayName;
 		}