Fix config usage during install process

diff --git a/src/Core/Config/Repository/Config.php b/src/Core/Config/Repository/Config.php
index 6efeb7f7c6702592f8aaf856ad2df2823ebfefb7..72e7fa2724669b29faa09efafa7c0381b2e05ae1 100644 (file)
--- a/src/Core/Config/Repository/Config.php
+++ b/src/Core/Config/Repository/Config.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Core\Config\Repository;
 
+use Friendica\App\Mode;
 use Friendica\Core\Config\Exception\ConfigPersistenceException;
 use Friendica\Core\Config\Util\ValueConversion;
 use Friendica\Database\Database;
@@ -32,10 +33,13 @@ class Config
 {
        /** @var Database */
        protected $db;
+       /** @var Mode */
+       protected $mode;
 
-       public function __construct(Database $db)
+       public function __construct(Database $db, Mode $mode)
        {
-               $this->db = $db;
+               $this->db   = $db;
+               $this->mode = $mode;
        }
 
        protected static $table_name = 'config';
@@ -47,7 +51,7 @@ class Config
         */
        public function isConnected(): bool
        {
-               return $this->db->isConnected();
+               return $this->db->isConnected() && !$this->mode->isInstall();
        }
 
        /**

diff --git a/src/Core/PConfig/Repository/PConfig.php b/src/Core/PConfig/Repository/PConfig.php
index 50637135f6c48be0f68e0ac3a79c02e09c32ac8e..516a60fa9cd847970326d21a3b1ca56f1683b8f3 100644 (file)
--- a/src/Core/PConfig/Repository/PConfig.php
+++ b/src/Core/PConfig/Repository/PConfig.php
@@ -21,6 +21,7 @@
 
 namespace Friendica\Core\PConfig\Repository;
 
+use Friendica\App\Mode;
 use Friendica\Core\Config\Util\ValueConversion;
 use Friendica\Core\PConfig\Exception\PConfigPersistenceException;
 use Friendica\Database\Database;
@@ -34,10 +35,13 @@ class PConfig
 
        /** @var Database */
        protected $db;
+       /** @var Mode */
+       protected $mode;
 
-       public function __construct(Database $db)
+       public function __construct(Database $db, Mode $mode)
        {
-               $this->db = $db;
+               $this->db   = $db;
+               $this->mode = $mode;
        }
 
        /**
@@ -47,7 +51,7 @@ class PConfig
         */
        public function isConnected(): bool
        {
-               return $this->db->isConnected();
+               return $this->db->isConnected() & !$this->mode->isInstall();
        }
 
        /**