fix(Tinebase/User): use default/auto locale for twig if missing

tine20 · Feb 23, 2023 · 2107670 · 2107670
1 parent 814ddd4
commit 2107670
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/tine20/Tinebase/Model/User.php b/tine20/Tinebase/Model/User.php
@@ -268,7 +268,11 @@ public function toArray($_recursive = TRUE)
 
     public function applyAccountTwig($name, $twig)
     {
-        $twig = new Tinebase_Twig(Tinebase_Core::getLocale(), Tinebase_Translation::getTranslation(), [
+        $locale = Tinebase_Core::getLocale();
+        if (! $locale) {
+            $locale = Tinebase_Translation::getLocale();
+        }
+        $twig = new Tinebase_Twig($locale, Tinebase_Translation::getTranslation(), [
             Tinebase_Twig::TWIG_LOADER =>
                 new Tinebase_Twig_CallBackLoader(__METHOD__ . $name, time() - 1, function() use($twig) { return $twig; })
         ]);