Update SSL.md

[friendica.git] / src / Util / Config / ConfigFileLoader.php

diff --git a/src/Util/Config/ConfigFileLoader.php b/src/Util/Config/ConfigFileLoader.php
index d677d4bfe0c568b49213cfaa34cc6aa30b3caadd..3d4f31a9d1fca798f61cbac072b19ce2fb398825 100644 (file)
--- a/src/Util/Config/ConfigFileLoader.php
+++ b/src/Util/Config/ConfigFileLoader.php
@@ -34,10 +34,11 @@ class ConfigFileLoader extends ConfigFileManager
         * expected local.config.php
         *
         * @param IConfigCache $config The config cache to load to
+        * @param bool         $raw    Setup the raw config format
         *
         * @throws \Exception
         */
-       public function setupCache(IConfigCache $config)
+       public function setupCache(IConfigCache $config, $raw = false)
        {
                $config->load($this->loadCoreConfig('defaults'));
                $config->load($this->loadCoreConfig('settings'));
@@ -48,7 +49,7 @@ class ConfigFileLoader extends ConfigFileManager
                $config->load($this->loadCoreConfig('local'), true);
 
                // In case of install mode, add the found basepath (because there isn't a basepath set yet
-               if ($this->appMode->isInstall()) {
+               if (!$raw && ($this->appMode->isInstall() || empty($config->get('system', 'basepath')))) {
                        // Setting at least the basepath we know
                        $config->set('system', 'basepath', $this->baseDir);
                }