From c0a005b204a3e432990c9c79786fa0e90193f74b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Tue, 9 Jul 2013 15:24:01 +0200
Subject: [PATCH] folders_metadata() -> folders_typedata()

---
 plugins/kolab_folders/kolab_folders.php | 8 ++++----
 plugins/libkolab/lib/kolab_storage.php  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/kolab_folders/kolab_folders.php b/plugins/kolab_folders/kolab_folders.php
index e8ca2a64..5b1d1d38 100644
--- a/plugins/kolab_folders/kolab_folders.php
+++ b/plugins/kolab_folders/kolab_folders.php
@@ -104,7 +104,7 @@ class kolab_folders extends rcube_plugin
         }
 
         // get folders types
-        $folderdata = kolab_storage::folders_metadata();
+        $folderdata = kolab_storage::folders_typedata();
 
         if (!is_array($folderdata)) {
             return $args;
@@ -362,7 +362,7 @@ class kolab_folders extends rcube_plugin
             return $args;
         }
 
-        $folderdata = kolab_storage::folders_metadata();
+        $folderdata = kolab_storage::folders_typedata();
 
         if (!is_array($folderdata)) {
              return $args;
@@ -442,7 +442,7 @@ class kolab_folders extends rcube_plugin
      */
     function get_default_folder($type)
     {
-        $folderdata = kolab_storage::folders_metadata();
+        $folderdata = kolab_storage::folders_typedata();
 
         if (!is_array($folderdata)) {
             return null;
@@ -512,7 +512,7 @@ class kolab_folders extends rcube_plugin
         }
 
         if ($folderdata === null) {
-            $folderdata = kolab_storage::folders_metadata();
+            $folderdata = kolab_storage::folders_typedata();
         }
 
         if (!is_array($folderdata)) {
diff --git a/plugins/libkolab/lib/kolab_storage.php b/plugins/libkolab/lib/kolab_storage.php
index d1ada99f..2f3cdc57 100644
--- a/plugins/libkolab/lib/kolab_storage.php
+++ b/plugins/libkolab/lib/kolab_storage.php
@@ -599,7 +599,7 @@ class kolab_storage
         $regexp = '/^' . preg_quote($filter, '/') . '(\..+)?$/';
 
         // get folders types
-        $folderdata = self::folders_metadata($prefix);
+        $folderdata = self::folders_typedata($prefix);
 
         if (!is_array($folderdata)) {
             return array();
@@ -651,7 +651,7 @@ class kolab_storage
      *
      * @return array|bool List of folders, False on failure
      */
-    static function folders_metadata($prefix = '*')
+    static function folders_typedata($prefix = '*')
     {
         if (!self::setup()) {
             return false;