Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Performance: Skip another few cache selects

Browse source
This commit is contained in:
Aleksander Machniak 2016-02-21 18:17:42 +01:00
parent 9972823957
commit 922d8de6d0
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/libkolab/lib/kolab_storage.php
View file

@ -1018,7 +1018,7 @@ class kolab_storage
$folder->children = array(); // reset list $folder->children = array(); // reset list
// skip top folders or ones with a custom displayname // skip top folders or ones with a custom displayname
if (count($path) < 1 || kolab_storage::custom_displayname($folder->name)) { if (count($path) < 1 || $folder->get_custom_displayname()) {
$tree->children[] = $folder; $tree->children[] = $folder;
} }
else { else {

17
plugins/libkolab/lib/kolab_storage_folder_api.php
View file

@ -146,6 +146,20 @@ abstract class kolab_storage_folder_api
* @return string Folder name * @return string Folder name
*/ */
public function get_name() public function get_name()
{
if ($name = $this->get_custom_displayname()) {
return $name;
}
return kolab_storage::object_prettyname($this->name);
}
/**
* Get the custom display name of this folder
*
* @return string Folder custom name
*/
public function get_custom_displayname()
{ {
$rcmail = rcube::get_instance(); $rcmail = rcube::get_instance();
@ -156,12 +170,11 @@ abstract class kolab_storage_folder_api
if ($name = $metadata[kolab_storage::NAME_KEY_PRIVATE]) { if ($name = $metadata[kolab_storage::NAME_KEY_PRIVATE]) {
return $name; return $name;
} }
if ($name = $metadata[kolab_storage::NAME_KEY_SHARED]) { if ($name = $metadata[kolab_storage::NAME_KEY_SHARED]) {
return $name; return $name;
} }
} }
return kolab_storage::object_prettyname($this->name);
} }
/** /**