Merge pull request #28790 from nextcloud/backport/23065/stable21

[stable21] Fix null displayname crash as described in #21885
nextcloud · Sep 23, 2021 · 8885881 · 8885881
2 parents 313e081 + 648b395
commit 8885881
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();