From 3e0d1c6eb3b01b8e0869acd2ec66c3c61e830c74 Mon Sep 17 00:00:00 2001
From: David Glick <david@glicksoftware.com>
Date: Fri, 18 Aug 2023 12:24:15 -0700
Subject: [PATCH] Use catalog's getpath method instead of internals

---
 src/plone/folder/nogopip.py | 6 ++++--
 src/plone/folder/ordered.py | 3 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/plone/folder/nogopip.py b/src/plone/folder/nogopip.py
index d8b25f4..d58f583 100644
--- a/src/plone/folder/nogopip.py
+++ b/src/plone/folder/nogopip.py
@@ -87,11 +87,13 @@ def documentToKeyMap(self):
         # results themselves.  luckily this is only ever called from
         # `sortResults`, so we can get it form there.  oh, and lurker
         # says this won't work in jython, though! :)
-        rs = currentframe().f_back.f_locals["rs"]
+        caller_locals = currentframe().f_back.f_locals
+        catalog = caller_locals["self"].aq_parent
+        rs = caller_locals["rs"]
         rids = {}
         items = []
         containers = {}
-        getpath = self.catalog.paths.get
+        getpath = catalog.getpath
         root = getUtility(ISiteRoot).getPhysicalRoot()
         for rid in rs:
             path = getpath(rid)
diff --git a/src/plone/folder/ordered.py b/src/plone/folder/ordered.py
index 72edf91..c12388a 100644
--- a/src/plone/folder/ordered.py
+++ b/src/plone/folder/ordered.py
@@ -195,9 +195,6 @@ def manage_renameObject(self, id, new_id, REQUEST=None):
         if old_position is None:
             return result
         self.moveObjectToPosition(new_id, old_position, suppress_events=True)
-        reindex = getattr(self._getOb(new_id), "reindexObject", None)
-        if reindex is not None:
-            reindex(idxs=["getObjPositionInParent"])
         return result
 
     # Dict interface