summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/comments/appinfo/app.php11
-rw-r--r--lib/private/Server.php16
2 files changed, 15 insertions, 12 deletions
diff --git a/apps/comments/appinfo/app.php b/apps/comments/appinfo/app.php
index e6974111811..15c545ae1e4 100644
--- a/apps/comments/appinfo/app.php
+++ b/apps/comments/appinfo/app.php
@@ -60,14 +60,3 @@ $commentsManager->registerEventHandler(function () {
$handler = $application->getContainer()->query(\OCA\Comments\EventHandler::class);
return $handler;
});
-$commentsManager->registerDisplayNameResolver('user', function($id) {
- $manager = \OC::$server->getUserManager();
- $user = $manager->get($id);
- if(is_null($user)) {
- $l = \OC::$server->getL10N('comments');
- $displayName = $l->t('Unknown user');
- } else {
- $displayName = $user->getDisplayName();
- }
- return $displayName;
-});
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);