1 |
mrjhb3 |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header |
2 |
|
|
--- e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header 2010-11-05 21:56:30.000000000 -0500 |
3 |
|
|
+++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/00header 2010-11-05 21:42:39.000000000 -0500 |
4 |
|
|
@@ -1,4 +1,4 @@ |
5 |
|
|
//00header |
6 |
|
|
/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */ |
7 |
|
|
-// $Horde: horde/config/conf.xml,v 1.74.2.89 2010/04/21 08:02:24 jan Exp $ |
8 |
|
|
+// $Horde: horde/config/conf.xml,v 1.74.2.90 2010-06-13 18:01:36 mrubinsk Exp $ |
9 |
|
|
|
10 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings |
11 |
|
|
--- e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings 2010-11-05 21:56:30.000000000 -0500 |
12 |
|
|
+++ mezzanine_patched_e-smith-horde-4.0.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/100GeneralSettings 2010-11-05 21:48:04.000000000 -0500 |
13 |
|
|
@@ -1,6 +1,9 @@ |
14 |
|
|
//100GeneralSettings |
15 |
|
|
$conf['vhosts'] = false; |
16 |
|
|
$conf['debug_level'] = E_ALL & ~E_NOTICE; |
17 |
|
|
+if (defined('E_DEPRECATED')) \{ |
18 |
|
|
+ $conf['debug_level'] &= ~E_DEPRECATED; |
19 |
|
|
+\} |
20 |
|
|
$conf['max_exec_time'] = 0; |
21 |
|
|
$conf['compress_pages'] = true; |
22 |
|
|
{ |
23 |
|
|
|
24 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/180DatatreeSystem mezzanine_patched_e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/180DatatreeSystem |
25 |
|
|
--- e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/180DatatreeSystem 2010-11-05 21:56:30.000000000 -0500 |
26 |
|
|
+++ mezzanine_patched_e-smith-horde-4.2.0/root/etc/e-smith/templates/home/httpd/html/horde/config/conf.php/180DatatreeSystem 2010-11-05 21:56:30.000000000 -0500 |
27 |
|
|
@@ -3,5 +3,4 @@ |
28 |
|
|
$conf['datatree']['params']['table_attributes'] = 'horde_datatree_attributes'; |
29 |
|
|
$conf['datatree']['params']['driverconfig'] = 'horde'; |
30 |
|
|
$conf['datatree']['driver'] = 'sql'; |
31 |
|
|
-$conf['group']['driver'] = 'datatree'; |
32 |
|
|
|
33 |
|
|
|
34 |
|
|
|