From bc7c0912aaf926ccba9264746c7fefa2cbe642e5 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Tue, 10 Nov 2020 22:10:37 +0100
Subject: [PATCH] simplify getLanguage call in request

---
 Controller/ApiController.php     | 2 +-
 Controller/BackendController.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 03fb7e3..a3b32d6 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -273,7 +273,7 @@ final class ApiController extends Controller
         }
 
         $view->addData('tcoll', $tcoll);
-        $view->addData('lang', $request->getData('lang') ?? $request->getHeader()->getL11n()->getLanguage());
+        $view->addData('lang', $request->getData('lang') ?? $request->getLanguage());
         $view->addData('template', $template);
         $view->addData('basepath', __DIR__ . '/../../../');
 
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index b4cefdd..0c34e6e 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -60,7 +60,7 @@ final class BackendController extends Controller
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response));
 
         $path      = \str_replace('+', ' ', (string) ($request->getData('path') ?? '/'));
-        $templates = TemplateMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())::getByVirtualPath($path);
+        $templates = TemplateMapper::withConditional('language', $response->getLanguage())::getByVirtualPath($path);
 
         list($collection, $parent) = CollectionMapper::getCollectionsByPath($path);
 
@@ -144,7 +144,7 @@ final class BackendController extends Controller
         //$file = preg_replace('([^\w\s\d\-_~,;:\.\[\]\(\).])', '', $template->getName());
 
         /** @var Template $template */
-        $template = TemplateMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())::get((int) $request->getData('id'));
+        $template = TemplateMapper::withConditional('language', $response->getLanguage())::get((int) $request->getData('id'));
 
         $view->setTemplate('/Modules/Helper/Theme/Backend/helper-single');
 
@@ -212,7 +212,7 @@ final class BackendController extends Controller
 
         $view->addData('unit', $this->app->orgId);
         $view->addData('tcoll', $tcoll);
-        $view->addData('lang', $request->getData('lang') ?? $request->getHeader()->getL11n()->getLanguage());
+        $view->addData('lang', $request->getData('lang') ?? $request->getLanguage());
         $view->addData('template', $template);
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1002701001, $request, $response));