From 91dacab047a9da2438996965f3ac8218cd720c5a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 04:15:38 +0200 Subject: [PATCH] continue with getter/setter removal --- Controller/ApiController.php | 2 +- Controller/BackendController.php | 2 +- Theme/Backend/mail-templates.tpl.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 813958d..36bdf79 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -186,7 +186,7 @@ final class ApiController extends Controller $itemL11n = new EmailL11n(); $itemL11n->email = $request->getDataInt('email') ?? 0; $itemL11n->setLanguage( - $request->getDataString('language') ?? $request->getLanguage() + $request->getDataString('language') ?? $request->header->l11n->language ); $itemL11n->subject = $request->getDataString('subject') ?? ''; $itemL11n->body = $request->getDataString('body') ?? ''; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index d42a4e4..9dbc7a9 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -74,7 +74,7 @@ final class BackendController extends Controller ->with('l11n') ->where('isTemplate', true) ->where('account', $request->header->account) - ->where('l11n/language', $response->getLanguage()) + ->where('l11n/language', $response->header->l11n->language) ->execute(); $view->setData('templates', $templates); diff --git a/Theme/Backend/mail-templates.tpl.php b/Theme/Backend/mail-templates.tpl.php index 6b86452..644511b 100755 --- a/Theme/Backend/mail-templates.tpl.php +++ b/Theme/Backend/mail-templates.tpl.php @@ -45,7 +45,7 @@ echo $this->getData('nav')->render(); ?> $url = UriFactory::build('{/base}/messages/template/single?{?}&id=' . $value->id); ?> - printHtml(empty($value->subject) ? $value->getL11nByLanguage($this->response->getLanguage())->subject : $value->subject); ?> + printHtml(empty($value->subject) ? $value->getL11nByLanguage($this->response->header->l11n->language)->subject : $value->subject); ?> printHtml($value->createdAt->format('Y-m-d')); ?>