gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.21, 1.22

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
 kolab/issue2546 (Horde should use name and email from ldap as defaults)

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.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- horde-webmail-1.2.0_kolab_openpkg.patch	8 Jan 2009 20:22:47 -0000	1.21
+++ horde-webmail-1.2.0_kolab_openpkg.patch	8 Jan 2009 21:10:05 -0000	1.22
@@ -1,6 +1,6 @@
 diff -r 9da66837e009 config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Thu Jan 08 21:20:43 2009 +0100
++++ b/config/conf.php	Thu Jan 08 22:06:32 2009 +0100
 @@ -0,0 +1,119 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -123,7 +123,7 @@
 +}
 diff -r 9da66837e009 config/conf.xml
 --- a/config/conf.xml	Tue Dec 30 11:36:13 2008 +0100
[...1047 lines suppressed...]
          }
  
@@ -13324,7 +13434,7 @@
          $result = $this->_store->save($attributes, $object_id);
 diff -r 9da66837e009 turba/lib/Driver/share.php
 --- a/turba/lib/Driver/share.php	Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/lib/Driver/share.php	Thu Jan 08 21:20:43 2009 +0100
++++ b/turba/lib/Driver/share.php	Thu Jan 08 22:06:33 2009 +0100
 @@ -145,7 +145,7 @@
      function _deleteAll($sourceName = null)
      {
@@ -13336,7 +13446,7 @@
      }
 diff -r 9da66837e009 turba/lib/Object.php
 --- a/turba/lib/Object.php	Tue Dec 30 11:36:13 2008 +0100
-+++ b/turba/lib/Object.php	Thu Jan 08 21:20:43 2009 +0100
++++ b/turba/lib/Object.php	Thu Jan 08 22:06:33 2009 +0100
 @@ -249,7 +249,10 @@
       */
      function addFile($info)