gunnar: server/patches/horde-webmail/1.1.1 horde-webmail-1.1.1_kolab_openpkg.patch, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Wed Aug 13 17:24:18 CEST 2008


Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.1.1
In directory doto:/tmp/cvs-serv15653/1.1.1

Modified Files:
	horde-webmail-1.1.1_kolab_openpkg.patch 
Log Message:
Updated version of the horde-webmail patch.

Index: horde-webmail-1.1.1_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.1.1/horde-webmail-1.1.1_kolab_openpkg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-webmail-1.1.1_kolab_openpkg.patch	11 Aug 2008 12:35:19 -0000	1.1
+++ horde-webmail-1.1.1_kolab_openpkg.patch	13 Aug 2008 15:24:15 -0000	1.2
@@ -1,6 +1,6 @@
-diff -r edb3eb2593d6 config/conf.php
+diff -r f41c3ad4df53 config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Mon Aug 11 14:33:48 2008 +0200
++++ b/config/conf.php	Wed Aug 13 17:22:41 2008 +0200
 @@ -0,0 +1,113 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -115,9 +115,9 @@
 +if (file_exists(dirname(__FILE__) . '/kolab.php')) {
 +  require_once(dirname(__FILE__) . '/kolab.php');
[...2752 lines suppressed...]
-+++ b/turba/lib/Driver.php	Mon Aug 11 14:33:48 2008 +0200
+diff -r f41c3ad4df53 turba/lib/Driver.php
+--- a/turba/lib/Driver.php	Wed Aug 13 13:01:02 2008 +0200
++++ b/turba/lib/Driver.php	Wed Aug 13 17:22:41 2008 +0200
 @@ -1368,9 +1368,6 @@
          $hash = array();
          $attr = $vcard->getAllAttributes();
@@ -3418,9 +1042,9 @@
  
              switch ($item['name']) {
              case 'FN':
-diff -r edb3eb2593d6 turba/lib/Driver/share.php
---- a/turba/lib/Driver/share.php	Mon Aug 11 14:33:35 2008 +0200
-+++ b/turba/lib/Driver/share.php	Mon Aug 11 14:33:48 2008 +0200
+diff -r f41c3ad4df53 turba/lib/Driver/share.php
+--- a/turba/lib/Driver/share.php	Wed Aug 13 13:01:02 2008 +0200
++++ b/turba/lib/Driver/share.php	Wed Aug 13 17:22:41 2008 +0200
 @@ -145,7 +145,7 @@
      function _deleteAll($sourceName = null)
      {





More information about the commits mailing list