X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FBaseSettingsModule.php;h=291ae8d0b6d7abee12f4cb10eab62ada7193edc2;hb=6cbfa5b862ce7a241fd4339129749f87dc19760c;hp=fdf3c8166427ed5cfe14c65bf0f8196b17e3cccd;hpb=8e885f5b971320c1f86075f86ce085cf39c4bd13;p=friendica.git

diff --git a/src/Module/BaseSettingsModule.php b/src/Module/BaseSettingsModule.php
index fdf3c81664..291ae8d0b6 100644
--- a/src/Module/BaseSettingsModule.php
+++ b/src/Module/BaseSettingsModule.php
@@ -6,15 +6,16 @@ use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 class BaseSettingsModule extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
-		$a = self::getApp();
+		$a = DI::app();
 
 		$tpl = Renderer::getMarkupTemplate('settings/head.tpl');
-		$a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
+		DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
 			'$ispublic' => L10n::t('everybody')
 		]);
 
@@ -73,8 +74,8 @@ class BaseSettingsModule extends BaseModule
 
 		$tabs[] = [
 			'label' => L10n::t('Delegations'),
-			'url' => 'delegate',
-			'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate') ? 'active' : ''),
+			'url' => 'settings/delegation',
+			'selected' => (($a->argc > 1) && ($a->argv[1] === 'delegation') ? 'active' : ''),
 			'accesskey' => 'd',
 		];
 
@@ -87,8 +88,8 @@ class BaseSettingsModule extends BaseModule
 
 		$tabs[] = [
 			'label' => L10n::t('Export personal data'),
-			'url' => 'uexport',
-			'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport') ? 'active' : ''),
+			'url' => 'settings/userexport',
+			'selected' => (($a->argc > 1) && ($a->argv[1] === 'userexport') ? 'active' : ''),
 			'accesskey' => 'e',
 		];
 
@@ -101,7 +102,7 @@ class BaseSettingsModule extends BaseModule
 
 
 		$tabtpl = Renderer::getMarkupTemplate("generic_links_widget.tpl");
-		$a->page['aside'] = Renderer::replaceMacros($tabtpl, [
+		DI::page()['aside'] = Renderer::replaceMacros($tabtpl, [
 			'$title' => L10n::t('Settings'),
 			'$class' => 'settings-widget',
 			'$items' => $tabs,