2 commits - plugins/kolab_addressbook

Aleksander Machniak machniak at kolabsys.com
Mon Dec 3 18:55:19 CET 2012


 plugins/kolab_addressbook/lib/kolab_addressbook_ui.php |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit a30344314ccf9b2987c2b2a098932f169c35b666
Merge: 850f5a5 df15df9
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon Dec 3 18:55:09 2012 +0100

    Merge branch 'master' of ssh://git.kolab.org/git/roundcube



commit 850f5a55b082966a2668db84469d7a87c640a9b6
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon Dec 3 18:54:19 2012 +0100

    Fix deprecated function usage

diff --git a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
index a98b6ce..baa6322 100644
--- a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
+++ b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
@@ -116,7 +116,7 @@ class kolab_addressbook_ui
 
         $hidden_fields[] = array('name' => '_source', 'value' => $folder);
 
-        $folder = rcube_charset_convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
+        $folder = rcube_charse::convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
         $delim  = $_SESSION['imap_delimiter'];
 
         if ($this->rc->action == 'plugin.book-save') {
@@ -131,7 +131,7 @@ class kolab_addressbook_ui
         }
         else if ($action == 'edit') {
             $path_imap = explode($delim, $folder);
-            $name      = rcube_charset_convert(array_pop($path_imap), 'UTF7-IMAP');
+            $name      = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
             $path_imap = implode($path_imap, $delim);
         }
         else { // create
@@ -144,8 +144,7 @@ class kolab_addressbook_ui
         if (strlen($folder)) {
             $hidden_fields[] = array('name' => '_oldname', 'value' => $folder);
 
-            $this->rc->storage_connect();
-            $options = $this->rc->get_storage()->mailbox_info($folder);
+            $options = $this->rc->get_storage()->folder_info($folder);
         }
 
         $form   = array();





More information about the commits mailing list