Branch 'roundcubemail-plugins-kolab-3.1' - plugins/libkolab
Thomas Brüderli
bruederli at kolabsys.com
Wed Oct 16 16:44:42 CEST 2013
plugins/libkolab/lib/kolab_storage.php | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
New commits:
commit 09a557f97fb3e91a2dcbd7c075862719a724088c
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Wed Oct 16 16:44:32 2013 +0200
Revert "Sort folders by hierarchy level first"
This reverts commit 24f64bee5ae8ac6e7c6522c5e7fb686df658ca46.
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 »
+ $nsnames[$ns][$folder->name] = strtolower(html_entity_decode(self::object_name($folder->name, $ns), ENT_COMPAT, RCUBE_CHARSET)); // decode »
}
$names = array();
More information about the commits
mailing list