2 commits - plugins/kolab_addressbook plugins/kolab_folders

Aleksander Machniak machniak at kolabsys.com
Fri Dec 7 13:40:32 CET 2012


 plugins/kolab_addressbook/lib/kolab_addressbook_ui.php |    2 +-
 plugins/kolab_folders/kolab_folders.php                |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a94bf55cd89e7f9e61e85007f5d7b5c47a495d30
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Dec 7 13:40:02 2012 +0100

    Fix typo

diff --git a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
index baa6322..a1504fb 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_charse::convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
+        $folder = rcube_charset::convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
         $delim  = $_SESSION['imap_delimiter'];
 
         if ($this->rc->action == 'plugin.book-save') {


commit 5991c115b8ec38ad2c910b9916fc017fb0ad83cc
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Fri Dec 7 11:03:33 2012 +0100

    RCMAIL_CHARSET -> RCUBE_CHARSET

diff --git a/plugins/kolab_folders/kolab_folders.php b/plugins/kolab_folders/kolab_folders.php
index 80389f6..a45c108 100644
--- a/plugins/kolab_folders/kolab_folders.php
+++ b/plugins/kolab_folders/kolab_folders.php
@@ -420,7 +420,7 @@ class kolab_folders extends rcube_plugin
                 $opt_name = 'kolab_folders_' . $type . '_' . $subtype;
                 if ($folder = $this->rc->config->get($opt_name)) {
                     // convert configuration value to UTF7-IMAP charset
-                    $folder = rcube_charset::convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
+                    $folder = rcube_charset::convert($folder, RCUBE_CHARSET, 'UTF7-IMAP');
                     // and namespace prefix if needed
                     if ($prefix && strpos($folder, $prefix) === false && $folder != 'INBOX') {
                         $folder = $prefix . $folder;





More information about the commits mailing list