summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2017-12-12 17:36:31 +0100
committerArthur Schiwon <blizzz@arthur-schiwon.de>2017-12-12 17:36:31 +0100
commit099a340bf5f66e6c188e8896646802b998ba7063 (patch)
tree26e26065a7c48408cc0183e6a2aa6aa54748a586 /lib
parent2943b54f98c53ded616ae9ab3ebe2c6b8e47f762 (diff)
downloadnextcloud-server-099a340bf5f66e6c188e8896646802b998ba7063.tar.gz
nextcloud-server-099a340bf5f66e6c188e8896646802b998ba7063.zip
The user displayNameResolver is specific to users, not the comments app
Other apps like spreed rely on it, and only can resolver per type can be registered anyhow. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Server.php16
1 files changed, 15 insertions, 1 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 8a5fb0fa96c..6898e93e3bb 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -897,7 +897,21 @@ class Server extends ServerContainer implements IServerContainer {
$factoryClass = $config->getSystemValue('comments.managerFactory', '\OC\Comments\ManagerFactory');
/** @var \OCP\Comments\ICommentsManagerFactory $factory */
$factory = new $factoryClass($this);
- return $factory->getManager();
+ $manager = $factory->getManager();
+
+ $manager->registerDisplayNameResolver('user', function($id) use ($c) {
+ $manager = $c->getUserManager();
+ $user = $manager->get($id);
+ if(is_null($user)) {
+ $l = $c->getL10N('core');
+ $displayName = $l->t('Unknown user');
+ } else {
+ $displayName = $user->getDisplayName();
+ }
+ return $displayName;
+ });
+
+ return $manager;
});
$this->registerAlias('CommentsManager', \OCP\Comments\ICommentsManager::class);