Branch 'roundcubemail-plugins-kolab-3.1' - plugins/kolab_files plugins/libcalendaring

Aleksander Machniak machniak at kolabsys.com
Tue Feb 25 14:02:16 CET 2014


 plugins/kolab_files/kolab_files.php       |    2 +-
 plugins/libcalendaring/libcalendaring.php |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c9ac346919ed5591c7b4df16dab6177261e365fd
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Tue Feb 25 14:01:05 2014 +0100

    rcmail -> rcube, RCMAIL_CHARSET -> RCUBE_CHARSET

diff --git a/plugins/kolab_files/kolab_files.php b/plugins/kolab_files/kolab_files.php
index ad9f284..f598c4a 100644
--- a/plugins/kolab_files/kolab_files.php
+++ b/plugins/kolab_files/kolab_files.php
@@ -33,7 +33,7 @@ class kolab_files extends rcube_plugin
 
     public function init()
     {
-        $this->rc = rcmail::get_instance();
+        $this->rc = rcube::get_instance();
 
         // Register hooks
         $this->add_hook('refresh', array($this, 'refresh'));
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index 4cd5782..d108364 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -686,10 +686,10 @@ class libcalendaring extends rcube_plugin
         $url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']);
         $message = $this->rc->gettext('loadingdata');
 
-        header('Content-Type: text/html; charset=' . RCMAIL_CHARSET);
+        header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
         print "<html>\n<head>\n"
             . '<meta http-equiv="refresh" content="0; url='.Q($url).'">' . "\n"
-            . '<meta http-equiv="content-type" content="text/html; charset='.RCMAIL_CHARSET.'">' . "\n"
+            . '<meta http-equiv="content-type" content="text/html; charset='.RCUBE_CHARSET.'">' . "\n"
             . "</head>\n<body>\n$message\n</body>\n</html>";
         exit;
     }




More information about the commits mailing list