move mail settings and file handling to additional ones, thus files_external gets its own section

1 files changed, 7 insertions, 7 deletions

diff --git a/settings/Controller/AdminSettingsController.php b/settings/Controller/AdminSettingsController.php
index 3efe481ca9e..3954497443b 100644
--- a/settings/Controller/AdminSettingsController.php
+++ b/settings/Controller/AdminSettingsController.php
@@ -34,6 +34,7 @@ use OCP\INavigationManager;
 use OCP\IRequest;
 use OCP\IUserManager;
 use OCP\Settings\IManager as ISettingsManager;
+use OCP\Template;
 
 /**
  * @package OC\Settings\Controller
@@ -83,12 +84,8 @@ class AdminSettingsController extends Controller {
 	}
 
 	private function getSettings($section) {
-		if($section === 'additional') {
-			return $this->getLegacyForms();
-		}
-
-		$settings = $this->settingsManager->getAdminSettings($section);
 		$html = '';
+		$settings = $this->settingsManager->getAdminSettings($section);
 		foreach ($settings as $prioritizedSettings) {
 			foreach ($prioritizedSettings as $setting) {
 				/** @var \OCP\Settings\ISettings $setting */
@@ -96,6 +93,9 @@ class AdminSettingsController extends Controller {
 				$html .= $form->renderAs('')->render();
 			}
 		}
+		if($section === 'additional') {
+			$html .= $this->getLegacyForms();
+		}
 		return ['content' => $html];
 	}
 
@@ -120,10 +120,10 @@ class AdminSettingsController extends Controller {
 			);
 		}, $forms);
 
-		$out = new \OCP\Template('settings', 'admin/additional');
+		$out = new Template('settings', 'admin/additional');
 		$out->assign('forms', $forms);
 
-		return ['content' => $out->fetchPage()];
+		return $out->fetchPage();
 	}
 
 	/**