Fix null displayname crash as described in #21885

Signed-off-by: tgrant <tom.grant760@gmail.com>
5 years ago · f1710b57bc
parent 37feee4e87
commit f1710b57bc
1 changed files with 5 additions and 1 deletions
--- a/lib/private/Group/Database.php
+++ b/lib/private/Group/Database.php
@ -458,7 +458,11 @@ class Database extends ABackend implements

 	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();