Merge remote-tracking branch 'upstream/develop' into api4

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

diff --git a/src/Module/Install.php b/src/Module/Install.php
index bcd029246eea666fbf4c40b8171fede3273e6210..8f872c683e4421cab608df6d6bbb4e093ddf0706 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -30,7 +30,6 @@ use Friendica\Core\Theme;
 use Friendica\DI;
 use Friendica\Network\HTTPException;
 use Friendica\Util\BasePath;
-use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
 
 class Install extends BaseModule
@@ -66,7 +65,7 @@ class Install extends BaseModule
         */
        private static $installer;
 
-       public static function init(array $parameters = [])
+       public function init()
        {
                $a = DI::app();
 
@@ -95,7 +94,7 @@ class Install extends BaseModule
                self::$currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK;
        }
 
-       public static function post(array $parameters = [])
+       public function post()
        {
                $a           = DI::app();
                $configCache = $a->getConfigCache();
@@ -178,7 +177,7 @@ class Install extends BaseModule
                }
        }
 
-       public static function content(array $parameters = [])
+       public function content(): string
        {
                $a           = DI::app();
                $configCache = $a->getConfigCache();
@@ -380,10 +379,8 @@ class Install extends BaseModule
        private static function checkSetting(Cache $configCache, array $post, $cat, $key, $default = null)
        {
                $configCache->set($cat, $key,
-                       Strings::escapeTags(
-                               trim(($post[sprintf('%s-%s', $cat, $key)] ?? '') ?:
-                                               ($default ?? $configCache->get($cat, $key))
-                               )
+                       trim(($post[sprintf('%s-%s', $cat, $key)] ?? '') ?:
+                                       ($default ?? $configCache->get($cat, $key))
                        )
                );
        }