Merge tag '3.6.8'

Hotfix release 3.6.8 Replace TL_MODE for C5
menatwork · May 24, 2024 · a3dfe6a · a3dfe6a
2 parents 1d8c4dc + d6f0370
commit a3dfe6a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/diagnostics.yml b/.github/workflows/diagnostics.yml
@@ -21,12 +21,16 @@ jobs:
             php: '8.2'
             phpcq_install: 'update'
             phpcq_flags: '--exit-0'
-          - contao:        '~5.1.0'
+          - contao:        '~5.3.0'
             php:           '8.1'
             phpcq_install: 'update'
             phpcq_flags:   ''
-          - contao: '~5.1.0'
-            php: '8.2'
+          - contao:        '~5.3.0'
+            php:           '8.2'
+            phpcq_install: 'update'
+            phpcq_flags:   ''
+          - contao: '~5.3.0'
+            php: '8.3'
             phpcq_install: 'update'
             phpcq_flags: '--exit-0'
 

diff --git a/.phpcq.yaml.dist b/.phpcq.yaml.dist
@@ -53,6 +53,7 @@ phpcq:
     - 31C7E470E2138192
     - 9093F8B32E4815AA
     - 5E6DDE998AB73B8E
+    - A978220305CD5C32
     # Composer normalize
     - C00543248C87FB13
     # phpmd

diff --git a/src/Contao/Widgets/MultiColumnWizard.php b/src/Contao/Widgets/MultiColumnWizard.php
@@ -1337,7 +1337,7 @@ private function buildWidgetForDcGeneral(array $arrData, array &$arrField)
         $model->setId(9999999);
         $model->setProperty($property->getName(), $arrField['value']);
 
-        if (TL_MODE === 'FE') {
+        if ($this->contaoApi->isFrontend()) {
             $manager = new WidgetManager($environment, $model);
         } else {
             $manager = new ContaoWidgetManager($environment, $model);