From c060677d209ad3eef97dd6711ddfd5cc7ff9f2f4 Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Thu, 12 Jun 2008 03:32:04 -0400
Subject: [PATCH] Enable direct download of (main|db).inc.php from the installer.
---
program/include/rcube_config.php | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 277299f..8e956de 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -40,6 +40,8 @@
/**
* Load config from local config file
+ *
+ * @todo Remove global $CONFIG
*/
private function load()
{
@@ -54,6 +56,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';
@@ -77,6 +82,9 @@
// clear output buffer
ob_end_clean();
+
+ // export config data
+ $GLOBALS['CONFIG'] = &$this->prop;
}
--
Gitblit v1.9.1