From b46ee0c4d54996ca34d6e4d369a6cb7a3d15c815 Mon Sep 17 00:00:00 2001
From: Paul Ilea <paul@sgalinski.de>
Date: Fri, 13 Oct 2017 15:38:15 +0300
Subject: [PATCH] [BUGFIX] Language dropdown selected fix
---
Classes/Controller/BackendController.php | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
index 10526c4..da66463 100644
--- a/Classes/Controller/BackendController.php
+++ b/Classes/Controller/BackendController.php
@@ -145,13 +145,7 @@ class BackendController extends ActionController {
$backendUser->pushModuleData('tools_beuser/index.php/web_SgNewsNews_' . $key, $menuSetting);
}
- $this->docHeaderComponent->setMetaInformation($this->pageInfo);
- $this->makeButtons();
- $this->makeLanguageMenu();
- $this->view->assign('pageUid', $this->pageUid);
- $this->view->assign('rootPageUid', $this->rootPageUid);
- $this->view->assign('docHeader', $this->docHeaderComponent->docHeaderContent());
- $this->view->assign('typo3Version', VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version));
+ $currentLanguageInfo = NULL;
if (!LicensingService::checkKey()) {
$this->view->assign('showLicenseBanner', TRUE);
@@ -160,10 +154,18 @@ class BackendController extends ActionController {
'tools_beuser/index.php/web_SgNewsNews_language', 'ses'
) ?: 0;
$languageOptions = BackendNewsUtility::getAvailableLanguages($this->pageUid);
- $currentLanguage = $languageOptions[$this->language] ?? NULL;
- $this->view->assign('languageInfo', $currentLanguage);
+ $currentLanguageInfo = $languageOptions[$this->language] ?? NULL;
}
+
+ $this->docHeaderComponent->setMetaInformation($this->pageInfo);
+ $this->makeButtons();
+ $this->makeLanguageMenu();
+ $this->view->assign('pageUid', $this->pageUid);
+ $this->view->assign('rootPageUid', $this->rootPageUid);
$this->view->assign('language', $this->language);
+ $this->view->assign('languageInfo', $currentLanguageInfo);
+ $this->view->assign('docHeader', $this->docHeaderComponent->docHeaderContent());
+ $this->view->assign('typo3Version', VersionNumberUtility::convertVersionNumberToInteger(TYPO3_version));
}
}
@@ -266,7 +268,7 @@ class BackendController extends ActionController {
->setHref(
BackendUtility::getModuleUrl('web_SgNewsNews') . '&id=' . $this->pageUid . '&SET[language]=' . $key
);
- if ((int) $this->language === $key) {
+ if ((int) $this->language === (int) $key) {
$menuItem->setActive(TRUE);
}
$languageMenu->addMenuItem($menuItem);
--
GitLab