gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.7, 1.8

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/patches/horde-webmail/1.2.0
In directory doto:/tmp/cvs-serv17498/horde-webmail/1.2.0

Modified Files:
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
More triggering fixes.

Index: horde-webmail-1.2.0_kolab_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_openpkg.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- horde-webmail-1.2.0_kolab_openpkg.patch	12 Nov 2008 10:27:14 -0000	1.7
+++ horde-webmail-1.2.0_kolab_openpkg.patch	12 Nov 2008 11:27:13 -0000	1.8
@@ -1,6 +1,6 @@
 diff -r f832e54a827a config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Wed Nov 12 11:24:31 2008 +0100
++++ b/config/conf.php	Wed Nov 12 12:26:48 2008 +0100
 @@ -0,0 +1,118 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -122,7 +122,7 @@
 +}
 diff -r f832e54a827a config/conf.xml
 --- a/config/conf.xml	Thu Oct 30 15:14:54 2008 +0100
[...1093 lines suppressed...]
          }
  
@@ -12662,7 +12697,7 @@
          $result = $this->_store->save($attributes, $object_id);
 diff -r f832e54a827a turba/lib/Driver/share.php
 --- a/turba/lib/Driver/share.php	Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/lib/Driver/share.php	Wed Nov 12 11:24:31 2008 +0100
++++ b/turba/lib/Driver/share.php	Wed Nov 12 12:26:48 2008 +0100
 @@ -145,7 +145,7 @@
      function _deleteAll($sourceName = null)
      {
@@ -12674,7 +12709,7 @@
      }
 diff -r f832e54a827a turba/lib/Object.php
 --- a/turba/lib/Object.php	Thu Oct 30 15:14:54 2008 +0100
-+++ b/turba/lib/Object.php	Wed Nov 12 11:24:31 2008 +0100
++++ b/turba/lib/Object.php	Wed Nov 12 12:26:48 2008 +0100
 @@ -249,7 +249,10 @@
       */
      function addFile($info)