Merge pull request #40 from ghermens/dev/site-config

[BUGFIX] Avoid repercussions from changes in site configuration form definition
lochmueller · Jan 16, 2025 · 50f7d5f · 50f7d5f
2 parents 4b0702b + 897531e
commit 50f7d5f
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/Configuration/SiteConfiguration/Overrides/sites.php b/Configuration/SiteConfiguration/Overrides/sites.php
@@ -112,11 +112,17 @@
     ],
 ];
 
-$GLOBALS['SiteConfiguration']['site']['types']['0']['showitem'] = str_replace(
-    'base,',
-    'base,--div--;LLL:EXT:language_detection/Resources/Private/Language/locallang.xlf:language.detection,enableLanguageDetection,allowAllPaths,fallbackDetectionLanguage,addIpLocationToBrowserLanguage,redirectHttpStatusCode,disableRedirectWithBackendSession,forwardRedirectParameters,--palette--;MaxMind;languageDetectionMaxMind,',
-    $GLOBALS['SiteConfiguration']['site']['types']['0']['showitem']
-);
+$GLOBALS['SiteConfiguration']['site']['types']['0']['showitem'] .=
+    ',--div--;LLL:EXT:language_detection/Resources/Private/Language/locallang.xlf:language.detection,
+        enableLanguageDetection,
+        allowAllPaths,
+        fallbackDetectionLanguage,
+        addIpLocationToBrowserLanguage,
+        redirectHttpStatusCode,
+        disableRedirectWithBackendSession,
+        forwardRedirectParameters,
+        --palette--;MaxMind;languageDetectionMaxMind,
+    ';
 
 $GLOBALS['SiteConfiguration']['site_language']['columns']['excludeFromLanguageDetection'] = [
     'label' => 'LLL:EXT:language_detection/Resources/Private/Language/locallang.xlf:exclude.language.from.detection',
@@ -126,8 +132,4 @@
     ],
 ];
 
-$GLOBALS['SiteConfiguration']['site_language']['types']['1']['showitem'] = str_replace(
-    'flag,',
-    'flag, excludeFromLanguageDetection, ',
-    $GLOBALS['SiteConfiguration']['site_language']['types']['1']['showitem']
-);
+$GLOBALS['SiteConfiguration']['site_language']['types']['1']['showitem'] .= ', excludeFromLanguageDetection, ';