From 388de0eb96b779fabc8677a05d97bf2515411d83 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 16 Apr 2012 11:59:08 +0000
Subject: - Replace some references to rcmail with rcube

git-svn-id: https://svn.roundcube.net/trunk@6092 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_config.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'roundcubemail/program/include/rcube_config.php')

diff --git a/roundcubemail/program/include/rcube_config.php b/roundcubemail/program/include/rcube_config.php
index 5cc8571c9..5fb5bee80 100644
--- a/roundcubemail/program/include/rcube_config.php
+++ b/roundcubemail/program/include/rcube_config.php
@@ -186,19 +186,15 @@ class rcube_config
             $result = $def;
         }
 
-        $rcmail = rcube::get_instance();
+        $rcube = rcube::get_instance();
 
         if ($name == 'timezone' && isset($this->prop['_timezone_value']))
             $result = $this->prop['_timezone_value'];
 
-        if (is_object($rcmail->plugins)) {
-            $plugin = $rcmail->plugins->exec_hook('config_get', array(
-                'name' => $name, 'default' => $def, 'result' => $result));
+        $plugin = $rcube->plugins->exec_hook('config_get', array(
+            'name' => $name, 'default' => $def, 'result' => $result));
 
-            return $plugin['result'];
-        }
-
-        return $result;
+        return $plugin['result'];
     }
 
 
-- 
cgit v1.2.3