Skip to content

Commit 68cf8d4

Browse files
committed
Drop unsupported options for elements and modules
- form-icon in ``fieldsetStop`` - display-utilities in ``root_page_dependent_modules``
1 parent d423264 commit 68cf8d4

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

contao/templates/style-manager-core.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2924,7 +2924,7 @@
29242924
<field title="chosen">1</field>
29252925
<field title="blankOption">1</field>
29262926
<field title="extendFormFields">1</field>
2927-
<field title="formFields">a:12:{i:0;s:11:"explanation";i:1;s:13:"fieldsetStart";i:2;s:12:"fieldsetStop";i:3;s:4:"text";i:4;s:8:"password";i:5;s:8:"textarea";i:6;s:6:"select";i:7;s:5:"radio";i:8;s:8:"checkbox";i:9;s:6:"upload";i:10;s:5:"range";i:11;s:7:"captcha";}</field>
2927+
<field title="formFields">a:11:{i:0;s:11:"explanation";i:1;s:13:"fieldsetStart";i:2;s:4:"text";i:3;s:8:"password";i:4;s:8:"textarea";i:5;s:6:"select";i:6;s:5:"radio";i:7;s:8:"checkbox";i:8;s:6:"upload";i:9;s:5:"range";i:10;s:7:"captcha";}</field>
29282928
</child>
29292929
<child alias="alignment">
29302930
<field title="pid">2040</field>
@@ -2936,7 +2936,7 @@
29362936
<field title="chosen">1</field>
29372937
<field title="blankOption">1</field>
29382938
<field title="extendFormFields">1</field>
2939-
<field title="formFields">a:12:{i:0;s:11:"explanation";i:1;s:13:"fieldsetStart";i:2;s:12:"fieldsetStop";i:3;s:4:"text";i:4;s:8:"password";i:5;s:8:"textarea";i:6;s:6:"select";i:7;s:5:"radio";i:8;s:8:"checkbox";i:9;s:6:"upload";i:10;s:5:"range";i:11;s:7:"captcha";}</field>
2939+
<field title="formFields">a:11:{i:0;s:11:"explanation";i:1;s:13:"fieldsetStart";i:2;s:4:"text";i:3;s:8:"password";i:4;s:8:"textarea";i:5;s:6:"select";i:6;s:5:"radio";i:7;s:8:"checkbox";i:8;s:6:"upload";i:9;s:5:"range";i:10;s:7:"captcha";}</field>
29402940
</child>
29412941
</children>
29422942
</archive>

src/Generator/ConfigGenerator.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public function getAllContentElements(): array
8888
return [];
8989
}
9090

91-
return $this->getArrayRecursiveKeys($GLOBALS['TL_CTE'], 'Stop');
91+
return $this->getArrayRecursiveKeys($GLOBALS['TL_CTE'], ['Stop']);
9292
}
9393

9494
/**
@@ -101,7 +101,7 @@ public function getAllFrontendModules(): array
101101
return [];
102102
}
103103

104-
return $this->getArrayRecursiveKeys($GLOBALS['FE_MOD']);
104+
return $this->getArrayRecursiveKeys($GLOBALS['FE_MOD'], ['root_page_dependent_modules']);
105105
}
106106

107107
/**
@@ -285,7 +285,7 @@ private function generateBackendCss(): void
285285
ThemeManager::createCSSFile('backendColors', $css);
286286
}
287287

288-
private function getArrayRecursiveKeys(array $array, ?string $filter = null): array
288+
private function getArrayRecursiveKeys(array $array, ?array $filters = []): array
289289
{
290290
$return = [];
291291

@@ -294,7 +294,12 @@ private function getArrayRecursiveKeys(array $array, ?string $filter = null): ar
294294
$return = array_merge($group, $return);
295295
}
296296

297-
if (null !== $filter)
297+
if (empty($filters))
298+
{
299+
return $return;
300+
}
301+
302+
foreach ($filters as $filter)
298303
{
299304
foreach ($return as $k => $v)
300305
{

0 commit comments

Comments
 (0)