Merge pull request #11141 from urbalazs/language-names

Add native language names to language selector & fix config during install
This commit is contained in:
Philipp
2022-01-23 20:55:40 +01:00
committed by GitHub
4 changed files with 49 additions and 18 deletions

View File

@@ -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();
}
/**