Merge pull request #715 from plone/714-migration-aq-wrapper

fix accidental storage with aq wrapper in migrate_base_class_to_new_class
plone · Dec 11, 2024 · c74347c · c74347c
2 parents 7f6e8c2 + a9bafbf
commit c74347c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/news/714.bugfix b/news/714.bugfix
@@ -0,0 +1 @@
+Fix migrate_base_class_to_new_class util to remove Acquisition wrappers. @davisagli
diff --git a/plone/app/contenttypes/utils.py b/plone/app/contenttypes/utils.py
@@ -1,3 +1,4 @@
+from Acquisition import aq_base
 from plone.dexterity.interfaces import IDexterityContent
 from plone.dexterity.interfaces import IDexterityFTI
 from plone.folder.interfaces import IOrdering
@@ -97,7 +98,7 @@ def migrate_base_class_to_new_class(
         parent = obj.__parent__
         parent._delOb(obj_id)
         obj.__class__ = new_class
-        parent._setOb(obj_id, obj)
+        parent._setOb(obj_id, aq_base(obj))
 
     is_container = isinstance(obj, BTreeFolder2Base)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix migrate_base_class_to_new_class util to remove Acquisition wrappers. @davisagli