From cd12a021d923555e7447bd7e0bcc4e3163869151 Mon Sep 17 00:00:00 2001
From: Maurits van Rees <maurits@vanrees.org>
Date: Thu, 29 Feb 2024 17:33:46 +0100
Subject: [PATCH] Cleanup viewlets.xml to not mention viewlets that no longer
 exist.

Nothing really goes wrong with non-existing viewlets, but it is confusing.
Fixes https://github.com/plone/Products.CMFPlone/issues/3911
---
 Products/CMFPlone/profiles/default/viewlets.xml | 12 +-----------
 news/3911.bugfix                                |  2 ++
 2 files changed, 3 insertions(+), 11 deletions(-)
 create mode 100644 news/3911.bugfix

diff --git a/Products/CMFPlone/profiles/default/viewlets.xml b/Products/CMFPlone/profiles/default/viewlets.xml
index 870ed08a06..317a3c2e03 100644
--- a/Products/CMFPlone/profiles/default/viewlets.xml
+++ b/Products/CMFPlone/profiles/default/viewlets.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <object>
-  <order manager="plone.portaltop"
-         skinname="Plone Default"
-  >
 
-  </order>
   <order manager="plone.portalheader"
          skinname="Plone Default"
   >
     <viewlet name="plone.anontools" />
     <viewlet name="plone.membertools" />
     <viewlet name="plone.logo" />
-    <viewlet name="plone.favicon" />
     <viewlet name="plone.searchbox" />
     <viewlet name="plone.app.i18n.locales.languageselector" />
     <viewlet name="plone.app.multilingual.languageselector" />
@@ -37,7 +32,7 @@
     <viewlet name="plone.contributors" />
     <viewlet name="plone.rights" />
     <viewlet name="plone.keywords" />
-    <viewlet name="plone.belowcontentbody.relateditems" />
+    <viewlet name="plone.relateditems" />
   </order>
   <order manager="plone.belowcontent"
          skinname="Plone Default"
@@ -58,9 +53,4 @@
     <viewlet name="plone.colophon" />
     <viewlet name="plone.site_actions" />
   </hidden>
-  <hidden manager="plone.belowcontent"
-          skinname="Plone Default"
-  >
-    <viewlet name="plone.manage_portlets_fallback" />
-  </hidden>
 </object>
diff --git a/news/3911.bugfix b/news/3911.bugfix
new file mode 100644
index 0000000000..1c581c21e9
--- /dev/null
+++ b/news/3911.bugfix
@@ -0,0 +1,2 @@
+Cleanup `viewlets.xml` to not mention viewlets that no longer exist.
+[maurits]