Imported Debian patch 0.3.1-4

[roundcube.git] / debian / patches / correct_install_path.patch

diff --git a/debian/patches/correct_install_path.patch b/debian/patches/correct_install_path.patch
index 35d8eafcfdd15950cbd9247caec9f9d720053678..04ec738a1c854a90511b0e9d39611721e8bb9750 100644 (file)
--- 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: b/program/include/iniset.php
+===================================================================
+--- a/program/include/iniset.php       2010-07-17 17:33:04.000000000 +0200
++++ b/program/include/iniset.php       2010-07-17 17:33:23.000000000 +0200
+@@ -27,7 +27,7 @@
+ define('JS_OBJECT_NAME', 'rcmail');
  
- // 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))
+ define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');