Merge remote-tracking branch 'upstream/2021.12-rc' into user-banner

[friendica.git] / src / Module / BaseSettings.php

diff --git a/src/Module/BaseSettings.php b/src/Module/BaseSettings.php
index 1a20fc3dc97caf0f9107456c0a07d4d9bdf6f821..9319662550a8897fe4c630b559815a0c38a75cbe 100644 (file)
--- a/src/Module/BaseSettings.php
+++ b/src/Module/BaseSettings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,10 +28,8 @@ use Friendica\DI;
 
 class BaseSettings extends BaseModule
 {
-       public static function content()
+       public static function createAside()
        {
-               $a = DI::app();
-
                $tpl = Renderer::getMarkupTemplate('settings/head.tpl');
                DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [
                        '$ispublic' => DI::l10n()->t('everybody')
@@ -126,4 +124,13 @@ class BaseSettings extends BaseModule
                        '$items' => $tabs,
                ]);
        }
+
+       protected function content(array $request = []): string
+       {
+               $a = DI::app();
+
+               static::createAside();
+
+               return '';
+       }
 }