From d4c00a9555d06d546b2a442942c59cf89d6a301c Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Wed, 13 Jan 2021 19:04:07 +0100 Subject: [PATCH] Do not ignore INBOX for the displayed folder hierarchy Summary: Previously INBOX.Archive and Archive were indistinguishable. Differential Revision: https://git.kolab.org/D2092 --- plugins/kolab_activesync/kolab_activesync_ui.php | 2 +- plugins/kolab_delegation/kolab_delegation.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/kolab_activesync/kolab_activesync_ui.php b/plugins/kolab_activesync/kolab_activesync_ui.php index 53134240..1b2c1c17 100644 --- a/plugins/kolab_activesync/kolab_activesync_ui.php +++ b/plugins/kolab_activesync/kolab_activesync_ui.php @@ -185,7 +185,7 @@ class kolab_activesync_ui $names = array(); foreach ($a_folders as $folder) { - $foldername = $origname = preg_replace('/^INBOX »\s+/', '', kolab_storage::object_prettyname($folder)); + $foldername = $origname = kolab_storage::object_prettyname($folder); // find folder prefix to truncate (the same code as in kolab_addressbook plugin) for ($i = count($names)-1; $i >= 0; $i--) { diff --git a/plugins/kolab_delegation/kolab_delegation.php b/plugins/kolab_delegation/kolab_delegation.php index af37744c..0b074774 100644 --- a/plugins/kolab_delegation/kolab_delegation.php +++ b/plugins/kolab_delegation/kolab_delegation.php @@ -563,7 +563,7 @@ class kolab_delegation extends rcube_plugin $names = array(); foreach ($a_folders as $folder) { - $foldername = $origname = preg_replace('/^INBOX »\s+/', '', kolab_storage::object_prettyname($folder)); + $foldername = $origname = kolab_storage::object_prettyname($folder); // find folder prefix to truncate (the same code as in kolab_addressbook plugin) for ($i = count($names)-1; $i >= 0; $i--) {