From 2ca388d0d756b57398d129f51ae6fa087e4b045e Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 09 May 2008 08:26:45 -0400
Subject: [PATCH] Call load_host_config() and add reference to Howto_Config (#1485040)
---
config/main.inc.php.dist | 1 +
program/include/rcube_config.php | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index ac34d6d..670bee2 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -273,6 +273,7 @@
$rcmail_config['dont_override'] = array();
// try to load host-specific configuration
+// see http://trac.roundcube.net/wiki/Howto_Config for more details
$rcmail_config['include_host_config'] = false;
// don't let users set pagesize to more than this value if set
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 277299f..91e3722 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -54,6 +54,9 @@
// load database config
include_once(INSTALL_PATH . 'config/db.inc.php');
$this->prop += (array)$rcmail_config;
+
+ // load host-specific configuration
+ $this->load_host_config();
// fix paths
$this->prop['skin_path'] = $this->prop['skin_path'] ? unslashify($this->prop['skin_path']) : 'skins/default';
--
Gitblit v1.9.1