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

folders_metadata() -> folders_typedata()

Browse source
This commit is contained in:
Aleksander Machniak 2013-07-09 15:24:01 +02:00
parent 007fd25f96
commit c0a005b204
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/kolab_folders/kolab_folders.php
View file

@ -104,7 +104,7 @@ class kolab_folders extends rcube_plugin
} }
// get folders types // get folders types
$folderdata = kolab_storage::folders_metadata(); $folderdata = kolab_storage::folders_typedata();
if (!is_array($folderdata)) { if (!is_array($folderdata)) {
return $args; return $args;
@ -362,7 +362,7 @@ class kolab_folders extends rcube_plugin
return $args; return $args;
} }
$folderdata = kolab_storage::folders_metadata(); $folderdata = kolab_storage::folders_typedata();
if (!is_array($folderdata)) { if (!is_array($folderdata)) {
return $args; return $args;
@ -442,7 +442,7 @@ class kolab_folders extends rcube_plugin
*/ */
function get_default_folder($type) function get_default_folder($type)
{ {
$folderdata = kolab_storage::folders_metadata(); $folderdata = kolab_storage::folders_typedata();
if (!is_array($folderdata)) { if (!is_array($folderdata)) {
return null; return null;
@ -512,7 +512,7 @@ class kolab_folders extends rcube_plugin
} }
if ($folderdata === null) { if ($folderdata === null) {
$folderdata = kolab_storage::folders_metadata(); $folderdata = kolab_storage::folders_typedata();
} }
if (!is_array($folderdata)) { if (!is_array($folderdata)) {

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

@ -599,7 +599,7 @@ class kolab_storage
$regexp = '/^' . preg_quote($filter, '/') . '(\..+)?$/'; $regexp = '/^' . preg_quote($filter, '/') . '(\..+)?$/';
// get folders types // get folders types
$folderdata = self::folders_metadata($prefix); $folderdata = self::folders_typedata($prefix);
if (!is_array($folderdata)) { if (!is_array($folderdata)) {
return array(); return array();
@ -651,7 +651,7 @@ class kolab_storage
* *
* @return array|bool List of folders, False on failure * @return array|bool List of folders, False on failure
*/ */
static function folders_metadata($prefix = '*') static function folders_typedata($prefix = '*')
{ {
if (!self::setup()) { if (!self::setup()) {
return false; return false;