X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fpatches%2Fcorrect_install_path.patch;h=8970045b70c7fe746d884293dcaeeeae8229bd0a;hb=5073df0f02f556142911afec7b1bfa193eb0de7a;hp=35d8eafcfdd15950cbd9247caec9f9d720053678;hpb=4045ab92ea0c5b27fcd716f2c442e1848888546b;p=roundcube.git

diff --git a/debian/patches/correct_install_path.patch b/debian/patches/correct_install_path.patch
index 35d8eaf..8970045 100644
--- a/debian/patches/correct_install_path.patch
+++ b/debian/patches/correct_install_path.patch
@@ -1,11 +1,15 @@
---- roundcubemail-0.1~rc1~dfsg.orig/index.php~	2007-05-18 15:11:22.000000000 +0200
-+++ roundcubemail-0.1~rc1~dfsg.orig/index.php	2007-05-20 14:12:35.000000000 +0200
-@@ -47,7 +47,7 @@
+Install path is /var/lib/roundcube for Debian. Don't try to guess it.
+
+Index: roundcube/program/include/iniset.php
+===================================================================
+--- roundcube.orig/program/include/iniset.php	2012-09-29 11:30:58.643126935 +0200
++++ roundcube/program/include/iniset.php	2012-09-29 11:31:44.360041205 +0200
+@@ -43,7 +43,7 @@
+ define('RCMAIL_START', microtime(true));
  
- // define global vars
- $OUTPUT_TYPE = 'html';
--$INSTALL_PATH = dirname(__FILE__);
-+$INSTALL_PATH = '/var/lib/roundcube';
- $MAIN_TASKS = array('mail','settings','addressbook','logout');
+ if (!defined('INSTALL_PATH')) {
+-    define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
++    define('INSTALL_PATH', '/var/lib/roundcube/');
+ }
  
- if (empty($INSTALL_PATH))
+ if (!defined('RCMAIL_CONFIG_DIR')) {