summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-07-29 14:21:49 +0200
committerGitHub <noreply@github.com>2020-07-29 14:21:49 +0200
commit403040255f36e97be523dbaff50627c76dee1a6d (patch)
tree3c93cc7721613abecf011593276f9cf97bbd8616 /lib
parent149f3db88df12b7e0f56bd609bd15ee0c1247daf (diff)
parent63a90aaf476e47562ed2dfa42cc9893900fe33a2 (diff)
downloadnextcloud-server-403040255f36e97be523dbaff50627c76dee1a6d.tar.gz
nextcloud-server-403040255f36e97be523dbaff50627c76dee1a6d.zip
Merge pull request #21976 from nextcloud/backport/21658/stable18
[stable18] allow admin to configure the max trashbin size
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Server.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 6e197d32ccb..acc96f98a55 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -136,6 +136,8 @@ use OCP\Accounts\IAccountManager;
use OCP\App\IAppManager;
use OCP\Authentication\LoginCredentials\IStore;
use OCP\Collaboration\AutoComplete\IManager;
+use OCP\Command\IBus;
+use OCP\Comments\ICommentsManager;
use OCP\Contacts\ContactsMenu\IActionFactory;
use OCP\Contacts\ContactsMenu\IContactsStore;
use OCP\Dashboard\IDashboardManager;
@@ -859,7 +861,7 @@ class Server extends ServerContainer implements IServerContainer {
$this->registerService('AsyncCommandBus', function (Server $c) {
$busClass = $c->getConfig()->getSystemValue('commandbus');
if ($busClass) {
- list($app, $class) = explode('::', $busClass, 2);
+ [$app, $class] = explode('::', $busClass, 2);
if ($c->getAppManager()->isInstalled($app)) {
\OC_App::loadApp($app);
return $c->query($class);
@@ -871,6 +873,7 @@ class Server extends ServerContainer implements IServerContainer {
return new CronBus($jobList);
}
});
+ $this->registerAlias(IBus::class, 'AsyncCommandBus');
$this->registerService('TrustedDomainHelper', function ($c) {
return new TrustedDomainHelper($this->getConfig());
});