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

---
 Controller/ApiController.php     | 12 ++++++------
 Controller/BackendController.php |  8 ++++----
 Models/Tag.php                   |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 601bdbb..f178503 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -219,14 +219,14 @@ final class ApiController extends Controller
      */
     private function createTagL11nFromRequest(RequestAbstract $request) : TagL11n
     {
-        $l11nTag = new TagL11n();
-        $l11nTag->setTag((int) ($request->getData('tag') ?? 0));
-        $l11nTag->setLanguage((string) (
-            $request->getData('language') ?? $request->getHeader()->getL11n()->getLanguage()
+        $tagL11n = new TagL11n();
+        $tagL11n->setTag((int) ($request->getData('tag') ?? 0));
+        $tagL11n->setLanguage((string) (
+            $request->getData('language') ?? $request->getLanguage()
         ));
-        $l11nTag->setTitle((string) ($request->getData('title') ?? ''));
+        $tagL11n->setTitle((string) ($request->getData('title') ?? ''));
 
-        return $l11nTag;
+        return $tagL11n;
     }
 
     /**
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 896e8b5..ab8ded2 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -74,17 +74,17 @@ final class BackendController extends Controller
 
         if ($request->getData('ptype') === 'p') {
             $view->setData('tags',
-                TagMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
+                TagMapper::withConditional('language', $response->getLanguage())
                     ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25)
             );
         } elseif ($request->getData('ptype') === 'n') {
             $view->setData('tags',
-                TagMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
+                TagMapper::withConditional('language', $response->getLanguage())
                     ::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25)
             );
         } else {
             $view->setData('tags',
-                TagMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())
+                TagMapper::withConditional('language', $response->getLanguage())
                     ::getAfterPivot(0, null, 25)
             );
         }
@@ -107,7 +107,7 @@ final class BackendController extends Controller
     public function viewTagSingle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface
     {
         $view = new View($this->app->l11nManager, $request, $response);
-        $tag  = TagMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage())::get((int) $request->getData('id'));
+        $tag  = TagMapper::withConditional('language', $response->getLanguage())::get((int) $request->getData('id'));
 
         $view->setTemplate('/Modules/Tag/Theme/Backend/tag-single');
         $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1007501001, $request, $response));
diff --git a/Models/Tag.php b/Models/Tag.php
index eed0ee3..c0acac4 100755
--- a/Models/Tag.php
+++ b/Models/Tag.php
@@ -173,6 +173,7 @@ class Tag implements \JsonSerializable, ArrayableInterface
      * Set title
      *
      * @param string|TagL11n $title Tag article title
+     * @param string         $lang  Language
      *
      * @return void
      *