From 1c861df079de9f6f4f3cdbe5c49b3ef8dd124eed Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 19 Jun 2015 06:57:54 -0400
Subject: [PATCH] Fix some plugins for use without rcmail class
---
plugins/filesystem_attachments/filesystem_attachments.php | 6 +++---
plugins/redundant_attachments/redundant_attachments.php | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/plugins/filesystem_attachments/filesystem_attachments.php b/plugins/filesystem_attachments/filesystem_attachments.php
index 50bd624..164efa6 100644
--- a/plugins/filesystem_attachments/filesystem_attachments.php
+++ b/plugins/filesystem_attachments/filesystem_attachments.php
@@ -50,7 +50,7 @@
{
$args['status'] = false;
$group = $args['group'];
- $rcmail = rcmail::get_instance();
+ $rcmail = rcube::get_instance();
// use common temp dir for file uploads
$temp_dir = $rcmail->config->get('temp_dir');
@@ -78,7 +78,7 @@
$args['status'] = false;
if (!$args['path']) {
- $rcmail = rcmail::get_instance();
+ $rcmail = rcube::get_instance();
$temp_dir = $rcmail->config->get('temp_dir');
$tmp_path = tempnam($temp_dir, 'rcmAttmnt');
@@ -160,7 +160,7 @@
function file_id()
{
- $userid = rcmail::get_instance()->user->ID;
+ $userid = rcube::get_instance()->user->ID;
list($usec, $sec) = explode(' ', microtime());
$id = preg_replace('/[^0-9]/', '', $userid . $sec . $usec);
diff --git a/plugins/redundant_attachments/redundant_attachments.php b/plugins/redundant_attachments/redundant_attachments.php
index 24af7d9..17427f0 100644
--- a/plugins/redundant_attachments/redundant_attachments.php
+++ b/plugins/redundant_attachments/redundant_attachments.php
@@ -63,7 +63,7 @@
return;
}
- $rcmail = rcmail::get_instance();
+ $rcmail = rcube::get_instance();
// load configuration
$this->load_config();
--
Gitblit v1.9.1