forked from pool/roundcubemail
92c4b48fd2
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
27 lines
928 B
Diff
27 lines
928 B
Diff
diff --git a/installer/index.php b/installer/index.php
|
|
index 4c94fea..204cdf4 100644
|
|
--- a/installer/index.php
|
|
+++ b/installer/index.php
|
|
@@ -43,7 +43,7 @@ ini_set('error_reporting', E_ALL&~E_NOTICE);
|
|
ini_set('display_errors', 1);
|
|
|
|
define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
|
|
-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
|
|
+define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
|
|
define('RCMAIL_CHARSET', 'UTF-8');
|
|
|
|
$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
|
|
diff --git a/program/include/iniset.php b/program/include/iniset.php
|
|
index 3809479..5004448 100644
|
|
--- a/program/include/iniset.php
|
|
+++ b/program/include/iniset.php
|
|
@@ -52,7 +52,7 @@ if (!defined('INSTALL_PATH')) {
|
|
}
|
|
|
|
if (!defined('RCMAIL_CONFIG_DIR')) {
|
|
- define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
|
|
+ define('RCMAIL_CONFIG_DIR', '/etc/roundcubemail');
|
|
}
|
|
|
|
// make sure path_separator is defined
|