From a26f9d16a672385b2227faa7296a661a95090106 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Thu, 9 Dec 2021 17:11:34 +0100
Subject: [PATCH] [BUGFIX] Ensure getTreeList() keeps ordering of subpages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolves: #96310
Releases: main, 11.5
Change-Id: Ie12ca1683b3d8668deafbd37af03437f047c0ac4
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72599
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benni Mack <benni@typo3.org>
---
 .../frontend/Classes/ContentObject/ContentObjectRenderer.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index 4c662a25566f..8f46a54f7072 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -5597,6 +5597,7 @@ class ContentObjectRenderer implements LoggerAwareInterface
                         // Call recursively, if the id is not in prevID_array:
                         if (!in_array($next_id, $prevId_array)) {
                             $theList = array_merge(
+                                $theList,
                                 GeneralUtility::intExplode(
                                     ',',
                                     $this->getTreeList(
@@ -5610,8 +5611,7 @@ class ContentObjectRenderer implements LoggerAwareInterface
                                         $recursionLevel + 1
                                     ),
                                     true
-                                ),
-                                $theList
+                                )
                             );
                         }
                     }
-- 
GitLab