Update ElementContentExtension.php

moritz-sauer-13 · Jul 13, 2023 · a0c26dc · a0c26dc
1 parent 97f4a04
commit a0c26dc
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/Extensions/ElementContentExtension.php b/src/Extensions/ElementContentExtension.php
@@ -164,11 +164,13 @@ public function updateCMSFields(FieldList $fields): FieldList
                     /*As long as no Layout is selected, all Fields will be removed*/
                     $fields->removeByName($field);
                     if (!$fields->dataFieldByName($field)) {
+                        $fields->removeByName($field);
                         $field = str_replace('ID', '', $field);
                         $fields->removeByName($field);
                     }
                 } else {
                     if (!$this->getConfigVariable('Layouts', $this->owner->ElementStyle)['FieldsVisible'][$field]) {
+                        $fields->removeByName($field);
                         $field = str_replace('ID', '', $field);
                         $fields->removeByName($field);
                     }