summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2013-10-16 14:44:32 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2013-10-16 14:44:32 (GMT)
commit09a557f97fb3e91a2dcbd7c075862719a724088c (patch)
tree45110e17c8e196e071ed02f342db6216deb0242c
parent9d8ec10247dab9bdb27f30aca7e96ad0c2d99e68 (diff)
downloadroundcubemail-plugins-kolab-09a557f97fb3e91a2dcbd7c075862719a724088c.tar.gz
Revert "Sort folders by hierarchy level first"
This reverts commit 24f64bee5ae8ac6e7c6522c5e7fb686df658ca46.
-rw-r--r--plugins/libkolab/lib/kolab_storage.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index 8ede2e3..23d273b 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -677,13 +677,11 @@ class kolab_storage
*/
public static function sort_folders($folders)
{
- $delimiter = self::$imap->get_hierarchy_delimiter();
$nsnames = array('personal' => array(), 'shared' => array(), 'other' => array());
foreach ($folders as $folder) {
$folders[$folder->name] = $folder;
$ns = $folder->get_namespace();
- $level = count(explode($delimiter, $folder->name));
- $nsnames[$ns][$folder->name] = sprintf('%02d-%s', $level, strtolower(html_entity_decode(self::object_name($folder->name, $ns), ENT_COMPAT, RCUBE_CHARSET))); // decode &raquo;
+ $nsnames[$ns][$folder->name] = strtolower(html_entity_decode(self::object_name($folder->name, $ns), ENT_COMPAT, RCUBE_CHARSET)); // decode &raquo;
}
$names = array();