diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2021-05-25 21:13:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-25 21:13:00 +0200 |
| commit | 3d1c78647e2dcc9c3ca2dcad28f39a2b7e5bc589 (patch) | |
| tree | 95dfffb2c62c07b594581e90d50d78fb94c0224c /lib | |
| parent | 1b21b173e63011d91c80441de3f80e9025eacf0a (diff) | |
| parent | 23dbbca1a0bc5a99224b8f5e5553042a53aa8767 (diff) | |
| download | nextcloud-server-3d1c78647e2dcc9c3ca2dcad28f39a2b7e5bc589.tar.gz nextcloud-server-3d1c78647e2dcc9c3ca2dcad28f39a2b7e5bc589.zip | |
Merge pull request #23065 from TomG736/FixEmptyDisplayName
Fix null displayname crash as described in #21885
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Group/Database.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php index 29fcb503b10..fb557eafbbd 100644 --- 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(); |