diff options
| -rw-r--r-- | apps/comments/js/commentstabview.js | 3 | ||||
| -rw-r--r-- | lib/private/Server.php | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js index 4d67ca90825..5d0edc9bafa 100644 --- a/apps/comments/js/commentstabview.js +++ b/apps/comments/js/commentstabview.js @@ -188,7 +188,8 @@ var $li = $(li); $li.find('.avatar').avatar(undefined, 32); return $li; - } + }, + sorter: function (q, items) { return items; } }, displayTpl: '<li>' + '<span class="avatar-name-wrapper">' diff --git a/lib/private/Server.php b/lib/private/Server.php index c03b7e04606..1621a194693 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -106,6 +106,7 @@ use OCA\Theming\ThemingDefaults; use OCP\App\IAppManager; use OCP\AppFramework\Utility\ITimeFactory; +use OCP\Collaboration\AutoComplete\IManager; use OCP\Defaults; use OCA\Theming\Util; use OCP\Federation\ICloudIdManager; @@ -1011,10 +1012,7 @@ class Server extends ServerContainer implements IServerContainer { }); $this->registerAlias('CollaboratorSearch', \OCP\Collaboration\Collaborators\ISearch::class); - $this->registerService(\OCP\Collaboration\AutoComplete\IManager::class, function (Server $c) { - return new Collaboration\AutoComplete\Manager($c); - }); - $this->registerAlias('AutoCompleteManager', \OCP\Collaboration\AutoComplete\IManager::class); + $this->registerAlias(\OCP\Collaboration\AutoComplete\IManager::class, \OC\Collaboration\AutoComplete\Manager::class); $this->registerService('SettingsManager', function (Server $c) { $manager = new \OC\Settings\Manager( @@ -1810,7 +1808,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCP\Collaboration\AutoComplete\IManager */ public function getAutoCompleteManager(){ - return $this->query('AutoCompleteManager'); + return $this->query(IManager::class); } /** |