From 42e328a85f5880e3e767eebaaa88b55a2b49d2ff Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 19 Sep 2008 15:42:11 -0400
Subject: [PATCH] Indent with spaces not tabs. Please respect our code-style when creating patches!
---
program/include/rcube_config.php | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 43f735b..c3b0c18 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -51,13 +51,13 @@
ob_start();
// load main config file
- if (include(INSTALL_PATH . 'config/main.inc.php'))
+ if (include(RCMAIL_CONFIG_DIR . '/main.inc.php'))
$this->prop = (array)$rcmail_config;
else
$this->errors[] = 'main.inc.php was not found.';
// load database config
- if (include(INSTALL_PATH . 'config/db.inc.php'))
+ if (include(RCMAIL_CONFIG_DIR . '/db.inc.php'))
$this->prop += (array)$rcmail_config;
else
$this->errors[] = 'db.inc.php was not found.';
@@ -84,9 +84,9 @@
ini_set('log_errors', 1);
if ($this->prop['log_driver'] == 'syslog') {
- ini_set('error_log', 'syslog');
+ ini_set('error_log', 'syslog');
} else {
- ini_set('error_log', $this->prop['log_dir'].'/errors');
+ ini_set('error_log', $this->prop['log_dir'].'/errors');
}
}
if ($this->prop['debug_level'] & 4) {
@@ -119,8 +119,8 @@
$fname = preg_replace('/[^a-z0-9\.\-_]/i', '', $_SERVER['HTTP_HOST']) . '.inc.php';
}
- if ($fname && is_file(INSTALL_PATH . 'config/' . $fname)) {
- include(INSTALL_PATH . 'config/' . $fname);
+ if ($fname && is_file(RCMAIL_CONFIG_DIR . '/' . $fname)) {
+ include(RCMAIL_CONFIG_DIR . '/' . $fname);
$this->prop = array_merge($this->prop, (array)$rcmail_config);
}
}
--
Gitblit v1.9.1