Fix null displayname crash as described in nextcloud#21885

Signed-off-by: tgrant <tom.grant760@gmail.com>
TomG736 · Sep 27, 2020 · a222e3a · a222e3a
1 parent 190f0be
commit a222e3a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php
@@ -456,7 +456,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();