Fix null displayname crash as described in #21885

Signed-off-by: tgrant <tom.grant760@gmail.com>
nextcloud · Mar 17, 2021 · f1710b5 · f1710b5
1 parent 37feee4
commit f1710b5
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php
@@ -458,7 +458,11 @@ public function countDisabledInGroup(string $gid): int {
 
 	public function getDisplayName(string $gid): string {
 		if (isset($this->groupCache[$gid])) {
-			return $this->groupCache[$gid]['displayname'];
+                        $displayName = $this->groupCache[$gid]['displayname'];
+
+                        if (isset($displayName) && trim($displayName) !== '') {
+                                return $displayName;
+                        }
 		}
 
 		$this->fixDI();