mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7472 from nextcloud/move-comment-user-displaynameresolver-to-server 

The user displayNameResolver is specific to users, not the comments app
This commit is contained in:
Roeland Jago Douma 2017-12-12 21:48:12 +01:00 committed by GitHub
parent 2943b54f98 099a340bf5
commit e17315954f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/comments/appinfo/app.php
View File

@ -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;
});

16
lib/private/Server.php
View File

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