1
0
forked from pool/roundcubemail

Accepting request 140828 from home:wrosenauer

last submit broke roundcube, this fixes it; notice: I had to manually remove my browser cookies after update to 0.8.3 before I was able to login again :-(

OBS-URL: https://build.opensuse.org/request/show/140828
OBS-URL: https://build.opensuse.org/package/show/server:php:applications/roundcubemail?expand=0&rev=45
This commit is contained in:
Wolfgang Rosenauer 2012-11-10 22:35:58 +00:00 committed by Git OBS Bridge
parent 20b142ecae
commit 92c4b48fd2

View File

@ -12,17 +12,15 @@ index 4c94fea..204cdf4 100644
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 3809479..b3e0ded 100644
index 3809479..5004448 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -51,10 +51,6 @@ if (!defined('INSTALL_PATH')) {
define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
@@ -52,7 +52,7 @@ if (!defined('INSTALL_PATH')) {
}
-if (!defined('RCMAIL_CONFIG_DIR')) {
if (!defined('RCMAIL_CONFIG_DIR')) {
- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
-}
-
+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
}
// make sure path_separator is defined
if (!defined('PATH_SEPARATOR')) {
define('PATH_SEPARATOR', (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') ? ';' : ':');