Merge branch 'hotfix/fix_be_nav' into 'release/2.3.0'

Fix BE navigation error See merge request metamodels/core!297
MetaModels · Jul 10, 2024 · 3fd6c4a · 3fd6c4a
2 parents 959bfab + b036152
commit 3fd6c4a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/CoreBundle/Contao/Hooks/AbstractContentElementAndModuleCallback.php b/src/CoreBundle/Contao/Hooks/AbstractContentElementAndModuleCallback.php
@@ -418,7 +418,7 @@ protected function buildFilterParamsFor(DC_Table $dataContainer, $elementName)
      */
     public function saveCallback(string $value = null)
     {
-        return '--null--' === $value ? null : base64_decode($value);
+        return ('--null--' === $value || null === $value) ? null : base64_decode($value);
     }
 
     /**

diff --git a/src/CoreBundle/EventListener/BackendNavigationListener.php b/src/CoreBundle/EventListener/BackendNavigationListener.php
@@ -35,6 +35,7 @@
 
 use function array_key_exists;
 use function array_map;
+use function array_unshift;
 use function in_array;
 use function is_array;
 
@@ -150,8 +151,11 @@ public function __invoke(MenuEvent $event): void
 
         // Show MetaModels config only for Admins.
         if ($isAdmin) {
+            // Add or override child - might have been introduced by parsing of legacy BE_MOD.
             $metaModelsNode->addChild($configNode = $this->buildConfigNode($factory, $request));
-            array_unshift($names, $configNode->getName());
+            if (!in_array($configNode->getName(), $names, true)) {
+                array_unshift($names, $configNode->getName());
+            }
         }
 
         $metaModelsNode->reorderChildren($names);

diff --git a/src/CoreBundle/EventListener/SetLocaleInMetaModelListener.php b/src/CoreBundle/EventListener/SetLocaleInMetaModelListener.php
@@ -31,7 +31,7 @@ public function __invoke(CreateMetaModelEvent $event): void
     {
         $metaModel = $event->getMetaModel();
         $language  = $GLOBALS['TL_LANGUAGE'] ?? null;
-        if ($language && $metaModel instanceof ITranslatedMetaModel) {
+        if (null !== $language && $metaModel instanceof ITranslatedMetaModel) {
             $metaModel->selectLanguage($language);
         }
     }

diff --git a/src/CoreBundle/Translator/MetaModelTranslatorConfigurator.php b/src/CoreBundle/Translator/MetaModelTranslatorConfigurator.php
@@ -92,7 +92,7 @@ private function fetchDomains(): iterable
             function (): iterable {
                 $result = [];
 
-                $installedLanguages = $this->localeProvider->getEnabledLocaleIds();
+                $installedLanguages = \array_values($this->localeProvider->getEnabledLocaleIds());
                 foreach ($this->factory->collectNames() as $metamodelName) {
                     $instance = $this->factory->getMetaModel($metamodelName);
                     if (!$instance instanceof ITranslatedMetaModel) {
-Original file line number
+Diff line change
@@ Expand Up @@
          */
         public function saveCallback(string $value = null)
         {
-            return '--null--' === $value ? null : base64_decode($value);
+            return ('--null--' === $value || null === $value) ? null : base64_decode($value);
         }
         /**
@@ Expand Down @@