summaryrefslogtreecommitdiffstats
path: root/lib/private/Server.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/Server.php')
-rw-r--r--lib/private/Server.php28
1 files changed, 26 insertions, 2 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 03c3633c9f2..44fc605826c 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -82,7 +82,7 @@ use OC\Security\SecureRandom;
use OC\Security\TrustedDomainHelper;
use OC\Session\CryptoWrapper;
use OC\Tagging\TagMapper;
-use OCA\Theming\Template;
+use OCA\Theming\ThemingDefaults;
use OCP\IL10N;
use OCP\IServerContainer;
use OCP\Security\IContentSecurityPolicyManager;
@@ -651,7 +651,7 @@ class Server extends ServerContainer implements IServerContainer {
}
if ($classExists && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) {
- return new Template(
+ return new ThemingDefaults(
$this->getConfig(),
$this->getL10N('theming'),
$this->getURLGenerator(),
@@ -722,6 +722,18 @@ class Server extends ServerContainer implements IServerContainer {
return $manager;
});
+ $this->registerService('SettingsManager', function(Server $c) {
+ $manager = new \OC\Settings\Manager(
+ $c->getLogger(),
+ $c->getDatabaseConnection(),
+ $c->getL10N('core'),
+ $c->getConfig(),
+ $c->getEncryptionManager(),
+ $c->getUserManager(),
+ $c->getLockingProvider()
+ );
+ return $manager;
+ });
}
/**
@@ -1277,6 +1289,11 @@ class Server extends ServerContainer implements IServerContainer {
return $this->query('MountManager');
}
+ /** @return \OCP\Files\Config\IUserMountCache */
+ function getUserMountCache() {
+ return $this->query('UserMountCache');
+ }
+
/**
* Get the MimeTypeDetector
*
@@ -1425,4 +1442,11 @@ class Server extends ServerContainer implements IServerContainer {
public function getLDAPProvider() {
return $this->query('LDAPProvider');
}
+
+ /**
+ * @return \OCP\Settings\IManager
+ */
+ public function getSettingsManager() {
+ return $this->query('SettingsManager');
+ }
}