summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_plugin.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-16 11:59:08 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2012-04-16 11:59:08 +0000
commit388de0eb96b779fabc8677a05d97bf2515411d83 (patch)
tree271cad39cd8bcef9f334eda01acdb027063f2fb7 /roundcubemail/program/include/rcube_plugin.php
parentfcd056183c14afad005a26157b76ad4a6dc31ab4 (diff)
- Replace some references to rcmail with rcube
git-svn-id: https://svn.roundcube.net/trunk@6092 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_plugin.php')
-rw-r--r--roundcubemail/program/include/rcube_plugin.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/roundcubemail/program/include/rcube_plugin.php b/roundcubemail/program/include/rcube_plugin.php
index e20f7ce6a..7048392e5 100644
--- a/roundcubemail/program/include/rcube_plugin.php
+++ b/roundcubemail/program/include/rcube_plugin.php
@@ -110,8 +110,8 @@ abstract class rcube_plugin
public function load_config($fname = 'config.inc.php')
{
$fpath = $this->home.'/'.$fname;
- $rcmail = rcube::get_instance();
- if (is_file($fpath) && !$rcmail->config->load_from_file($fpath)) {
+ $rcube = rcube::get_instance();
+ if (is_file($fpath) && !$rcube->config->load_from_file($fpath)) {
rcube::raise_error(array(
'code' => 527, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
@@ -177,7 +177,7 @@ abstract class rcube_plugin
foreach ($texts as $key => $value)
$add[$domain.'.'.$key] = $value;
- $rcmail = rcube::get_instance();
+ $rcmail = rcmail::get_instance();
$rcmail->load_language($lang, $add);
// add labels to client