Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
m---------3rdparty0
-rw-r--r--lib/private/Group/Database.php6
2 files changed, 5 insertions, 1 deletions
diff --git a/3rdparty b/3rdparty
-Subproject 813157ab1a7453ee7e7678036259e9ec2ffd083
+Subproject 2fa8874509eebddd763d530c85d05a37aadf2e0
diff --git a/lib/private/Group/Database.php b/lib/private/Group/Database.php
index c49f3bce596..49f5744a9d6 100644
--- a/lib/private/Group/Database.php
+++ b/lib/private/Group/Database.php
@@ -456,7 +456,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();