diff options
author | Joas Schilling <coding@schilljs.com> | 2017-03-17 13:34:23 +0100 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2017-03-17 13:40:58 +0100 |
commit | 75b81c3e01f3a5dc97e78c8e82fd5f94a071daba (patch) | |
tree | ca1e4806fe017748f8d4dcf209adae714c5fa8e4 /lib/private/Settings/Manager.php | |
parent | a5c8016c8b7c50f73b7a16b6bd2284ed06f35d8e (diff) | |
download | nextcloud-server-75b81c3e01f3a5dc97e78c8e82fd5f94a071daba.tar.gz nextcloud-server-75b81c3e01f3a5dc97e78c8e82fd5f94a071daba.zip |
Always suggest the overwrite.cli.url
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/Settings/Manager.php')
-rw-r--r-- | lib/private/Settings/Manager.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 7a339b94199..94df00551d4 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -29,6 +29,7 @@ use OCP\IConfig; use OCP\IDBConnection; use OCP\IL10N; use OCP\ILogger; +use OCP\IRequest; use OCP\IURLGenerator; use OCP\IUserManager; use OCP\Lock\ILockingProvider; @@ -56,6 +57,8 @@ class Manager implements IManager { private $userManager; /** @var ILockingProvider */ private $lockingProvider; + /** @var IRequest */ + private $request; /** @var IURLGenerator */ private $url; @@ -67,6 +70,7 @@ class Manager implements IManager { * @param EncryptionManager $encryptionManager * @param IUserManager $userManager * @param ILockingProvider $lockingProvider + * @param IRequest $request * @param Mapper $mapper * @param IURLGenerator $url */ @@ -78,6 +82,7 @@ class Manager implements IManager { EncryptionManager $encryptionManager, IUserManager $userManager, ILockingProvider $lockingProvider, + IRequest $request, Mapper $mapper, IURLGenerator $url ) { @@ -89,6 +94,7 @@ class Manager implements IManager { $this->encryptionManager = $encryptionManager; $this->userManager = $userManager; $this->lockingProvider = $lockingProvider; + $this->request = $request; $this->url = $url; } @@ -299,7 +305,7 @@ class Manager implements IManager { try { if ($section === 'server') { /** @var ISettings $form */ - $form = new Admin\Server($this->dbc, $this->config, $this->lockingProvider, $this->l); + $form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l); $forms[$form->getPriority()] = [$form]; $form = new Admin\ServerDevNotice(); $forms[$form->getPriority()] = [$form]; |