Adding basepath, urlpath, hostname and ssl_policy to installation

[friendica.git] / src / Database / DBA.php

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index c5ba523810e59f9523b7cedf9c554a7c106eb516..bbf134e8ad8dc5b9df75a1a639828a7a67c67a05 100644 (file)
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -44,10 +44,6 @@ class DBA
         * @var LoggerInterface
         */
        private static $logger;
-       /**
-        * @var string
-        */
-       private static $basePath;
        private static $server_info = '';
        private static $connection;
        private static $driver;
@@ -63,14 +59,13 @@ class DBA
        private static $db_name = '';
        private static $db_charset = '';
 
-       public static function connect($basePath, IConfigCache $configCache, Profiler $profiler, LoggerInterface $logger, $serveraddr, $user, $pass, $db, $charset = null)
+       public static function connect(IConfigCache $configCache, Profiler $profiler, LoggerInterface $logger, $serveraddr, $user, $pass, $db, $charset = null)
        {
                if (!is_null(self::$connection) && self::connected()) {
                        return true;
                }
 
                // We are storing these values for being able to perform a reconnect
-               self::$basePath = $basePath;
                self::$configCache = $configCache;
                self::$profiler = $profiler;
                self::$logger = $logger;
@@ -189,7 +184,7 @@ class DBA
        public static function reconnect() {
                self::disconnect();
 
-               $ret = self::connect(self::$basePath, self::$configCache, self::$profiler, self::$logger, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
+               $ret = self::connect(self::$configCache, self::$profiler, self::$logger, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
                return $ret;
        }
 
@@ -1079,7 +1074,7 @@ class DBA
         * This process must only be started once, since the value is cached.
         */
        private static function buildRelationData() {
-               $definition = DBStructure::definition(self::$basePath);
+               $definition = DBStructure::definition(self::$configCache->get('system', 'basepath'));
 
                foreach ($definition AS $table => $structure) {
                        foreach ($structure['fields'] AS $field => $field_struct) {