summaryrefslogtreecommitdiffstats
path: root/lib/private/Settings/Manager.php
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@arthur-schiwon.de>2017-06-16 15:00:15 +0200
committerArthur Schiwon <blizzz@arthur-schiwon.de>2017-06-23 12:37:42 +0200
commitd7a2290ce15c70b219ecae8f0076e38a2471070d (patch)
tree01cb2b272264882565d36456dba7fa43e467209a /lib/private/Settings/Manager.php
parent0dcce5a83568ecf40f59e7efcc1308ace89d15d5 (diff)
downloadnextcloud-server-d7a2290ce15c70b219ecae8f0076e38a2471070d.tar.gz
nextcloud-server-d7a2290ce15c70b219ecae8f0076e38a2471070d.zip
take over changes from #5084
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib/private/Settings/Manager.php')
-rw-r--r--lib/private/Settings/Manager.php17
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index 7da8bfe65df..d04f4abdcd8 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -24,6 +24,7 @@
namespace OC\Settings;
use OC\Accounts\AccountManager;
+use OCP\App\IAppManager;
use OCP\AppFramework\QueryException;
use OCP\Encryption\IManager as EncryptionManager;
use OCP\IConfig;
@@ -69,6 +70,8 @@ class Manager implements IManager {
private $l10nFactory;
/** @var \OC_Defaults */
private $defaults;
+ /** @var IAppManager */
+ private $appManager;
/**
* @param ILogger $log
@@ -100,7 +103,8 @@ class Manager implements IManager {
AccountManager $accountManager,
IGroupManager $groupManager,
IFactory $l10nFactory,
- \OC_Defaults $defaults
+ \OC_Defaults $defaults,
+ IAppManager $appManager
) {
$this->log = $log;
$this->dbc = $dbc;
@@ -116,6 +120,7 @@ class Manager implements IManager {
$this->groupManager = $groupManager;
$this->l10nFactory = $l10nFactory;
$this->defaults = $defaults;
+ $this->appManager = $appManager;
}
/**
@@ -402,7 +407,15 @@ class Manager implements IManager {
try {
if ($section === 'personal-info') {
/** @var ISettings $form */
- $form = new Personal\PersonalInfo($this->config, $this->userManager, $this->groupManager, $this->accountManager, $this->l10nFactory, $this->l);
+ $form = new Personal\PersonalInfo(
+ $this->config,
+ $this->userManager,
+ $this->groupManager,
+ $this->accountManager,
+ $this->appManager,
+ $this->l10nFactory,
+ $this->l
+ );
$forms[$form->getPriority()] = [$form];
}
if($section === 'sessions') {