Merge branch 'main' into better_topic_migration

Author: pbauer

CHANGES.rst

@@ -37,6 +37,10 @@ Changelog
   - Export sort_on and sort_reversed
   - Export customView as tabular_view
   [pbauer]
+  
+- Always import discussions independent if discussion support is enabled or not
+  on a particular content object (#182)
+  [ajung]
 
 
 1.7 (2023-01-20)

src/collective/exportimport/import_other.py

@@ -601,8 +601,6 @@ def import_data(self, data):
             obj = api.content.get(UID=conversation_data["uuid"])
             if not obj:
                 continue
-            if not obj.restrictedTraverse("@@conversation_view").enabled():
-                continue
             added = 0
             conversation = IConversation(obj)