From 21076706185bbbfb67da6c656057ac555a235714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Sch=C3=BCle?=
Date: Thu, 23 Feb 2023 09:30:31 +0100
Subject: [PATCH] fix(Tinebase/User): use default/auto locale for twig if
missing
---
tine20/Tinebase/Model/User.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tine20/Tinebase/Model/User.php b/tine20/Tinebase/Model/User.php
index 944fa4434db..8a18219392b 100644
--- 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; })
]);