Merge branch 'develop' into mastodon-instance-v2-implementation

[friendica.git] / src / Core / L10n.php

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 0f879c494848ae6c73239b9b922dd8e194dfaea9..3f74a408496299d3b1be0059a7c548ccd46efec3 100644 (file)
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -85,10 +85,15 @@ class L10n
         * @var Database
         */
        private $dba;
+       /**
+        * @var IManageConfigValues
+        */
+       private $config;
 
        public function __construct(IManageConfigValues $config, Database $dba, IHandleSessions $session, array $server, array $get)
        {
                $this->dba    = $dba;
+               $this->config = $config;
 
                $this->loadTranslationTable(L10n::detectLanguage($server, $get, $config->get('system', 'language', self::DEFAULT)));
                $this->setSessionVariable($session);
@@ -157,9 +162,9 @@ class L10n
                $a->strings = [];
 
                // load enabled addons strings
-               $addons = $this->dba->select('addon', ['name'], ['installed' => true]);
-               while ($p = $this->dba->fetch($addons)) {
-                       $name = Strings::sanitizeFilePathItem($p['name']);
+               $addons = array_keys($this->config->get('addons') ?? []);
+               foreach ($addons as $addon) {
+                       $name = Strings::sanitizeFilePathItem($addon);
                        if (file_exists(__DIR__ . "/../../addon/$name/lang/$lang/strings.php")) {
                                include __DIR__ . "/../../addon/$name/lang/$lang/strings.php";
                        }
@@ -188,10 +193,10 @@ class L10n
        {
                $lang_variable = $server['HTTP_ACCEPT_LANGUAGE'] ?? null;
 
-               $acceptedLanguages = preg_split('/,\s*/', $lang_variable);
-
-               if (empty($acceptedLanguages)) {
+               if (empty($lang_variable)) {
                        $acceptedLanguages = [];
+               } else {
+                       $acceptedLanguages = preg_split('/,\s*/', $lang_variable);
                }
 
                // Add get as absolute quality accepted language (except this language isn't valid)