summaryrefslogtreecommitdiff
path: root/plugins/calendar/calendar.php
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2012-10-17 09:54:25 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2012-10-17 09:54:25 (GMT)
commit2d08c58e56ebe9c0dd8c55679c887714178ed994 (patch)
tree7a4c5210fbfa9cdf5638181539c0b13d1a2a8bed /plugins/calendar/calendar.php
parent5be0b06fcbf61dacd493467b57041f808b04f1c7 (diff)
downloadroundcubemail-plugins-kolab-2d08c58e56ebe9c0dd8c55679c887714178ed994.tar.gz
Fix/prepare plugins to use out of Roundcube (where rcmail object doesn't exist)
Diffstat (limited to 'plugins/calendar/calendar.php')
-rw-r--r--plugins/calendar/calendar.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index f51af3c..a526570 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -75,7 +75,7 @@ class calendar extends rcube_plugin
{
$this->require_plugin('libcalendaring');
- $this->rc = rcmail::get_instance();
+ $this->rc = rcube::get_instance();
$this->lib = libcalendaring::get_instance();
$this->register_task('calendar', 'calendar');
@@ -1094,7 +1094,7 @@ class calendar extends rcube_plugin
}
foreach ((array)$event['attachments'] as $k => $attachment) {
- $event['attachments'][$k]['classname'] = rcmail_filetype2classname($attachment['mimetype'], $attachment['name']);
+ $event['attachments'][$k]['classname'] = rcube_utils::file2class($attachment['mimetype'], $attachment['name']);
}
return array(
@@ -1936,13 +1936,13 @@ class calendar extends rcube_plugin
if ($attachment['status'] && !$attachment['abort']) {
$id = $attachment['id'];
- $attachment['classname'] = rcmail_filetype2classname($attachment['mimetype'], $attachment['name']);
+ $attachment['classname'] = rcube_utils::file2class($attachment['mimetype'], $attachment['name']);
// store new attachment in session
unset($attachment['status'], $attachment['abort'], $attachment['data']);
$_SESSION[self::SESSION_KEY]['attachments'][$id] = $attachment;
- $attachment['id'] = 'rcmfile' . $attachment['id']; # add prefix to consider it 'new'
+ $attachment['id'] = 'rcmfile' . $attachment['id']; // add prefix to consider it 'new'
$event['attachments'][] = $attachment;
}
}