From bcfac75b06038b45d35f54955fcfcde4197c1453 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@arthur-schiwon.de>
Date: Tue, 31 Oct 2017 13:55:03 +0100
Subject: [PATCH] simplify registration of manager in server container
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
---
apps/comments/js/commentstabview.js | Bin 21385 -> 21437 bytes
lib/private/Server.php | 8 +++-----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index 4d67ca908258b3f98cc584cc189d0499fbd7d16d..5d0edc9bafa1cc4dfc32580fe9fef32a06acd9eb 100644
GIT binary patch
delta 66
zcmeBN&bW6u<AzTX#yVV_AW)oNRFYa`rI1#dmt2yWpQoTvsH2cslA2qrsZgy@lv+|+
Pln3EkD{THKF~bS~>>L*y
delta 14
WcmdnHoUwB`<AzTXo7E(zTLAzu)dmy*
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);
}
/**
--
GitLab