From 94e6cb02f3bfb7a4e2b755b48e4527ff5e1b6d0e Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 12 Nov 2020 12:58:26 +0200 Subject: [PATCH] Fixed `header.admin.children_display_order` in Flex Pages to work just like with regular pages --- CHANGELOG.md | 3 ++- system/src/Grav/Common/Flex/Types/Pages/PageIndex.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c97dafeb..5a9ddf688 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,8 @@ * Fixed `print_r()` in twig * Fixed sorting by groups in `Flex Users` * Changing `Flex Page` template causes the other language versions of that page to lose their content [admin#1958](https://github.com/getgrav/grav-plugin-admin/issues/1958) - * Fixed plugins getting intialized multiple times (by CLI commands for example) + * Fixed plugins getting initialized multiple times (by CLI commands for example) + * Fixed `header.admin.children_display_order` in Flex Pages to work just like with regular pages # v1.7.0-rc.17 ## 10/07/2020 diff --git a/system/src/Grav/Common/Flex/Types/Pages/PageIndex.php b/system/src/Grav/Common/Flex/Types/Pages/PageIndex.php index fe3f114f7..0e7e961d1 100644 --- a/system/src/Grav/Common/Flex/Types/Pages/PageIndex.php +++ b/system/src/Grav/Common/Flex/Types/Pages/PageIndex.php @@ -414,7 +414,7 @@ class PageIndex extends FlexPageIndex implements PageCollectionInterface /** @var Header $header */ $header = $page->header(); - if ($header->get('admin.children_display_order') === 'collection' && ($orderby = $header->get('content.order.by'))) { + if (!$field && $header->get('admin.children_display_order') === 'collection' && ($orderby = $header->get('content.order.by'))) { // Use custom sorting by page header. $sortby = $orderby; $order = $header->get('content.order.dir', $order);