Move additional settings to main server settings

Signed-off-by: Julius Härtl <jus@bitgrid.net>

2 files changed, 4 insertions, 7 deletions

diff --git a/lib/private/Settings/Admin/Mail.php b/lib/private/Settings/Admin/Mail.php
index 46a0d654f57..74a94a4c7a0 100644
--- a/lib/private/Settings/Admin/Mail.php
+++ b/lib/private/Settings/Admin/Mail.php
@@ -29,7 +29,7 @@ use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\Settings\ISettings;
 
-class Additional implements ISettings {
+class Mail implements ISettings {
 	/** @var IConfig */
 	private $config;
 
@@ -81,6 +81,6 @@ class Additional implements ISettings {
 	 * E.g.: 70
 	 */
 	public function getPriority() {
-		return 0;
+		return 10;
 	}
 }
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php
index ebca8e64921..68f43a60c90 100644
--- a/lib/private/Settings/Manager.php
+++ b/lib/private/Settings/Manager.php
@@ -269,6 +269,8 @@ class Manager implements IManager {
 			/** @var ISettings $form */
 			$form = new Admin\Server($this->dbc, $this->request, $this->config, $this->lockingProvider, $this->l);
 			$forms[$form->getPriority()] = [$form];
+			$form = new Admin\Mail($this->config);
+			$forms[$form->getPriority()] = [$form];
 		}
 		if ($section === 'encryption') {
 			/** @var ISettings $form */
@@ -280,11 +282,6 @@ class Manager implements IManager {
 			$form = new Admin\Sharing($this->config, $this->l);
 			$forms[$form->getPriority()] = [$form];
 		}
-		if ($section === 'additional') {
-			/** @var ISettings $form */
-			$form = new Admin\Additional($this->config);
-			$forms[$form->getPriority()] = [$form];
-		}
 		if ($section === 'tips-tricks') {
 			/** @var ISettings $form */
 			$form = new Admin\TipsTricks($this->config);