gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_openpkg.patch, 1.4, 1.5

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Attachment support for Horde.

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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- horde-webmail-1.2.0_kolab_openpkg.patch	27 Oct 2008 20:09:49 -0000	1.4
+++ horde-webmail-1.2.0_kolab_openpkg.patch	7 Nov 2008 14:05:29 -0000	1.5
@@ -1,6 +1,6 @@
-diff -r 622108627ce6 config/conf.php
+diff -r f832e54a827a config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Mon Oct 27 21:06:47 2008 +0100
++++ b/config/conf.php	Fri Nov 07 15:03:43 2008 +0100
 @@ -0,0 +1,118 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
@@ -120,9 +120,9 @@
 +if (file_exists(dirname(__FILE__) . '/kolab.php')) {
 +  require_once(dirname(__FILE__) . '/kolab.php');
[...2487 lines suppressed...]
      {
@@ -11131,3 +12430,18 @@
          }
          return $this->_driver->_deleteAll($sourceName);
      }
+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	Fri Nov 07 15:03:43 2008 +0100
+@@ -249,7 +249,10 @@
+      */
+     function addFile($info)
+     {
+-        $this->_vfsInit();
++        $result = $this->_vfsInit();
++        if (is_a($result, 'PEAR_Error')) {
++            return $result;
++        }
+ 
+         $dir = TURBA_VFS_PATH . '/' . $this->getValue('__uid');
+         $file = $info['name'];