Merge branch 'master' into bug_search_event_restapi

Author: luca-bellenghi

CHANGES.rst

@@ -1,12 +1,25 @@
 Changelog
 =========
 
-5.9.2 (unreleased)
+5.9.4 (unreleased)
 ------------------
 
 - Nothing changed yet.
 
 
+5.9.3 (2025-11-24)
+------------------
+
+- Fix on #151 changes (#152)
+  [mamico]
+
+
+5.9.2 (2025-11-20)
+------------------
+
+- Avoid acquisition problems in monkeypatch (#151).
+  [cekk]
+
 5.9.1 (2025-09-25)
 ------------------
 - Exclude "teaser" to avoid block modification by resolveuidserializer

setup.py

@@ -16,7 +16,7 @@
 
 setup(
     name="redturtle.volto",
-    version="5.9.2.dev0",
+    version="5.9.4.dev0",
     description="Helper package to setup a RedTurtle's Plone site ready to work with Volto.",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

src/redturtle/volto/monkey.py

@@ -205,15 +205,16 @@ def plone_restapi_blocks_linkintegrity_blocksretriever_retrieveLinks(self):
     """
 
     links = set()
-    blocks = getattr(self.context, "blocks", {})
+    context = aq_base(self.context)
+    blocks = getattr(context, "blocks", {})
     if not blocks:
         return links
-    for block in visit_blocks(self.context, blocks):
+    for block in visit_blocks(context, blocks):
         if not isinstance(block, dict):
             continue
 
         for handler in iter_block_transform_handlers(
-            self.context, block, IBlockFieldLinkIntegrityRetriever
+            context, block, IBlockFieldLinkIntegrityRetriever
         ):
             links |= set(handler(block))
     return links

test_plone60.cfg

@@ -21,3 +21,4 @@ docutils = 0.21.2
 plone.stringinterp = 2.0.0
 # plone.restapi >= 9.6.1 don't put subjects into SearchableText (to investigate)
 plone.restapi = 9.6.0
+cffi =