From a44933c00251fb84f3f614f6a76b407447024326 Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Wed, 6 Mar 2024 21:07:18 +0100
Subject: [PATCH] Conditionally load the zcml for our portlets.

Only load them when plone.app.portlets is available and Classic UI is wanted.
This is the default in Plone 6, but may be switched off in 6.1.
In Plone 7 this won't be the default.

See https://github.com/plone/Products.CMFPlone/issues/3923
---
 news/3923.bugfix               | 2 ++
 plone/app/event/configure.zcml | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 news/3923.bugfix

diff --git a/news/3923.bugfix b/news/3923.bugfix
new file mode 100644
index 00000000..14de9d74
--- /dev/null
+++ b/news/3923.bugfix
@@ -0,0 +1,2 @@
+Conditionally load the zcml for our portlets.
+[maurits]
diff --git a/plone/app/event/configure.zcml b/plone/app/event/configure.zcml
index d2ab79b4..e546895c 100644
--- a/plone/app/event/configure.zcml
+++ b/plone/app/event/configure.zcml
@@ -12,7 +12,6 @@
   <include package="plone.event" />
   <include package="plone.resource" />
   <include package="plone.formwidget.recurrence" />
-  <include package="plone.app.portlets" />
   <include package="plone.app.registry" />
   <include package="plone.app.z3cform" />
 
@@ -20,11 +19,16 @@
   <include file="permissions.zcml" />
   <include package=".dx" />
   <include package=".browser" />
-  <include package=".portlets" />
   <include package=".ical" />
   <include file="recurrence.zcml" />
   <include package=".upgrades" />
 
+  <configure zcml:condition="not-have disable-classic-ui">
+    <configure zcml:condition="installed plone.app.portlets">
+      <include package="plone.app.portlets" />
+      <include package=".portlets" />
+    </configure>
+  </configure>
   <utility
       name="plone.app.event.SynchronizationStrategies"
       component=".vocabularies.SynchronizationStrategies"