From 8448fca1f11f69e29bca568cb0042e83dd6be89e Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 03 Jul 2009 09:38:30 -0400
Subject: [PATCH] Let internal 'template_container' hook append to existing content
---
program/include/rcube_config.php | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index d4adb7b..e596c0b 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -70,7 +70,6 @@
// fix paths
$this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';
$this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp';
- $this->prop['plugins_dir'] = $this->prop['plugins_dir'] ? unslashify($this->prop['plugins_dir']) : INSTALL_PATH . 'plugins';
// fix default imap folders encoding
foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
@@ -135,8 +134,8 @@
*/
public function load_from_file($fpath)
{
- if (is_file($fpath)) {
- @include($fpath);
+ if (is_file($fpath) && is_readable($fpath)) {
+ include($fpath);
if (is_array($rcmail_config)) {
$this->prop = array_merge($this->prop, $rcmail_config);
return true;
--
Gitblit v1.9.1