| @@ -18,9 +18,9 @@ | ||
| 18 | 18 | public static function groupFieldsByPageId(array $fields): array |
| 19 | 19 | { |
| 20 | 20 | $fieldsByPage = []; |
| 21 | 21 | foreach ($fields as $field) { |
| 22 | - $pageId = $field['settings']['pageId'] ?? null; | |
| 22 | + $pageId = $field['pageId'] ?? ($field['settings']['pageId'] ?? null); | |
| 23 | 23 | if ($pageId) { |
| 24 | 24 | if (!isset($fieldsByPage[$pageId])) { |
| 25 | 25 | $fieldsByPage[$pageId] = []; |
| 26 | 26 | } |