From 66510e20d36cb8da4f3012ef063de7bfce9b51aa Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 09 May 2012 07:52:28 -0400
Subject: [PATCH] Merge pull request #1 from Brianetta/de-svn
---
program/include/rcube_config.php | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 5cc8571..5fb5bee 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -186,19 +186,15 @@
$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'];
}
--
Gitblit v1.9.1