diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9575436..15ae796 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -163,7 +163,7 @@ final class ApiController extends Controller $newsArticle->setTitle((string) ($request->getData('title') ?? '')); $newsArticle->setPlain($request->getData('plain') ?? ''); $newsArticle->setContent(Markdown::parse((string) ($request->getData('plain') ?? ''))); - $newsArticle->setLanguage(\strtolower((string) ($request->getData('lang') ?? $request->getHeader()->getL11n()->getLanguage()))); + $newsArticle->setLanguage(\strtolower((string) ($request->getData('lang') ?? $request->getLanguage()))); $newsArticle->setType((int) ($request->getData('type') ?? NewsType::ARTICLE)); $newsArticle->setStatus((int) ($request->getData('status') ?? NewsStatus::VISIBLE)); $newsArticle->setFeatured((bool) ($request->getData('featured') ?? true)); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index b5bc24d..951cafe 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -58,21 +58,21 @@ final class BackendController extends Controller implements DashboardElementInte if ($request->getData('ptype') === 'p') { $view->setData('news', - NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) + NewsArticleMapper::withConditional('language', $response->getLanguage()) ::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) ::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=') ::getBeforePivot((int) ($request->getData('id') ?? 0), null, 25) ); } elseif ($request->getData('ptype') === 'n') { $view->setData('news', - NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) + NewsArticleMapper::withConditional('language', $response->getLanguage()) ::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) ::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=') ::getAfterPivot((int) ($request->getData('id') ?? 0), null, 25) ); } else { $view->setData('news', - NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) + NewsArticleMapper::withConditional('language', $response->getLanguage()) ::withConditional('status', NewsStatus::VISIBLE, [NewsArticle::class]) ::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=') ::getAfterPivot(0, null, 25) @@ -90,7 +90,7 @@ final class BackendController extends Controller implements DashboardElementInte $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/News/Theme/Backend/dashboard-news'); - $news = NewsArticleMapper::withConditional('language', $response->getHeader()->getL11n()->getLanguage()) + $news = NewsArticleMapper::withConditional('language', $response->getLanguage()) ::withConditional('publish', new \DateTime('now'), [NewsArticle::class], '<=') ::getNewest(5);