New parameter to create a share block for display reasons

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

diff --git a/src/Core/L10n.php b/src/Core/L10n.php
index 0a91677b5d80080c205381b32732c08e2888b2ec..1d8cfa705bae359df110a42d826b28e5e11712a4 100644 (file)
--- a/src/Core/L10n.php
+++ b/src/Core/L10n.php
@@ -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";
                        }
@@ -329,7 +334,7 @@ class L10n
                                        // for some languages there is only a single array item
                                        $s = $t[0];
                                }
-                               // if $t is empty, skip it, because empty strings array are indended
+                               // if $t is empty, skip it, because empty strings array are intended
                                // to make string file smaller when there's no translation
                        } else {
                                $s = $t;