From ae722d641e5388b101c4f4e4c9f412b8899e4b9b Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Wed, 8 Jan 2020 21:49:11 +0100
Subject: [PATCH] [BUGFIX] Revert Use existing API instead of
 ContentObjectRenderer"

This reverts commit 47e63fc33c7dd45111465d833216eb474f224b9e
because of regressions.

Resolves: #89989
Reverts: #88344
Releases: master, 9.5
Change-Id: I1f43d0f343484366e81581435bdb418cfebf317a
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/64151
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Benni Mack <benni@typo3.org>
---
 .../Classes/ContentObject/Menu/AbstractMenuContentObject.php  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
index a14c3351955c..f2aee713047e 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
@@ -810,8 +810,8 @@ protected function prepareMenuItemsForDirectoryMenu($specialValue, $sortingField
                 $id = $mount_info['mount_pid'];
             }
             // Get sub-pages:
-            $rows = $this->sys_page->getMenu($id, '*', $sortingField);
-            foreach ($rows as $row) {
+            $statement = $this->parent_cObj->exec_getQuery('pages', ['pidInList' => $id, 'orderBy' => $sortingField]);
+            while ($row = $statement->fetch()) {
                 $tsfe->sys_page->versionOL('pages', $row, true);
                 if (!empty($row)) {
                     // Keep mount point?