Merge branch 'develop'

melisplatform · May 8, 2020 · 39cd6c1 · 39cd6c1
2 parents fd0d891 + 77f5d34
commit 39cd6c1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Service/MelisSiteConfigService.php b/src/Service/MelisSiteConfigService.php
@@ -147,8 +147,10 @@ public function getSiteConfigByPageId($pageId, $langLocale = false)
                                         $langId = $siteLangData->lang_cms_id;
                                     }
                                 } else {
-                                    $siteConfig['siteConfig'] = $config['site'][$siteName][$siteId][$langData['lang_cms_locale']];
-                                    $langId = $langData['lang_cms_id'];
+                                    foreach($langData as $val) {
+                                        $siteConfig['siteConfig'] = $config['site'][$siteName][$siteId][$val['lang_cms_locale']];
+                                        $langId = $val['lang_cms_id'];
+                                    }
                                 }
                                 $siteConfig['siteConfig']['site_id'] = $siteId;
                                 $siteConfig['siteConfig']['default_lang_id'] = $langId;
@@ -158,6 +160,7 @@ public function getSiteConfigByPageId($pageId, $langLocale = false)
                     }
                 }
             }
+
             $arrayParameters['result'] = $siteConfig;
             // Save cache key
             $melisEngineCacheSystem->setCacheByKey($cacheKey, $cacheConfig, $arrayParameters['result']);