From 9643bfc6a4a44a9259fb4dc4667b8d570236467f Mon Sep 17 00:00:00 2001
From: Ralf Becker <RalfBecker@outdoor-training.de>
Date: Mon, 3 May 2021 18:12:11 +0200
Subject: [PATCH] move "Collab Editor settings" and "Collabora Online" in a
 single "Collabora Online" tab

---
 filemanager/inc/class.filemanager_hooks.inc.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php
index ddc01f6125..9efab09a8c 100644
--- a/filemanager/inc/class.filemanager_hooks.inc.php
+++ b/filemanager/inc/class.filemanager_hooks.inc.php
@@ -223,10 +223,11 @@ class filemanager_hooks
 		}
 		if (!$GLOBALS['egw_info']['user']['apps']['collabeditor']) unset($document_doubleclick_action['collabeditor']);
 		asort($mimes);
+
 		$settings += array (
 			'sections.2' => array(
 				'type'  => 'section',
-				'title' => lang('Collab Editor settings'),
+				'title' => lang('Collabora Online'),
 				'no_lang'=> true,
 				'xmlrpc' => False,
 				'admin'  => False
@@ -265,13 +266,6 @@ class filemanager_hooks
 		if($GLOBALS['egw_info']['user']['apps']['collabora'])
 		{
 			$settings += array(
-				'sections.collabora' => array(
-					'type'  => 'section',
-					'title' => lang('Collabora'),
-					'no_lang'=> true,
-					'xmlrpc' => False,
-					'admin'  => False
-				),
 				'ui_mode' => array(
 					'type' => 'select',
 					'label' => lang('UI mode'),