Merge pull request #7358 from nupplaphil/bug/installer_db

[friendica.git] / src / Core / Config / Configuration.php

diff --git a/src/Core/Config/Configuration.php b/src/Core/Config/Configuration.php
index c6fe626d91e441f1033142e64bda5e2ce6b526ac..18191d0429c45bfd2fb5fc9f860fb71eaca2b008 100644 (file)
--- a/src/Core/Config/Configuration.php
+++ b/src/Core/Config/Configuration.php
@@ -10,16 +10,6 @@ namespace Friendica\Core\Config;
  */
 class Configuration
 {
-       /**
-        * The blacklist of configuration settings, which should not get saved to the backend
-        * @var array
-        */
-       private $configSaveBlacklist = [
-               'config' => [
-                       'hostname' => true,
-               ]
-       ];
-
        /**
         * @var Cache\IConfigCache
         */
@@ -98,7 +88,7 @@ class Configuration
 
                        if (isset($dbvalue)) {
                                $this->configCache->set($cat, $key, $dbvalue);
-                               return $dbvalue;
+                               unset($dbvalue);
                        }
                }
 
@@ -127,7 +117,7 @@ class Configuration
                $cached = $this->configCache->set($cat, $key, $value);
 
                // If there is no connected adapter, we're finished
-               if (!$this->configAdapter->isConnected() || !empty($this->configSaveBlacklist[$cat][$key])) {
+               if (!$this->configAdapter->isConnected()) {
                        return $cached;
                }