gunnar: server/patches/horde-webmail/1.2.0 horde-webmail-1.2.0_kolab_fbview_openpkg.patch, 1.2, 1.3 horde-webmail-1.2.0_kolab_openpkg.patch, 1.9, 1.10

cvs at kolab.org cvs at kolab.org
Fri Nov 14 08:50:59 CET 2008


Author: gunnar

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

Modified Files:
	horde-webmail-1.2.0_kolab_fbview_openpkg.patch 
	horde-webmail-1.2.0_kolab_openpkg.patch 
Log Message:
Updated the fbview patch.

Index: horde-webmail-1.2.0_kolab_fbview_openpkg.patch
===================================================================
RCS file: /kolabrepository/server/patches/horde-webmail/1.2.0/horde-webmail-1.2.0_kolab_fbview_openpkg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- horde-webmail-1.2.0_kolab_fbview_openpkg.patch	18 Sep 2008 19:10:13 -0000	1.2
+++ horde-webmail-1.2.0_kolab_fbview_openpkg.patch	14 Nov 2008 07:50:56 -0000	1.3
@@ -1,10 +1,10 @@
-diff -r 85d33de56004 config/conf.php
+diff -r 0a5153c325f0 config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Thu Sep 18 21:09:53 2008 +0200
-@@ -0,0 +1,115 @@
++++ b/config/conf.php	Fri Nov 14 08:50:29 2008 +0100
+@@ -0,0 +1,118 @@
 +<?php
 +/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
-+// $Horde: horde/config/conf.xml,v 1.74.2.76 2008/09/07 04:23:44 chuck Exp $
++// $Horde: horde/config/conf.xml,v 1.74.2.78 2008/09/12 10:01:41 jan Exp $
[...12125 lines suppressed...]
++            unset($attributes['photo']);
++            unset($attributes['phototype']);
+         }
+ 
+         $result = $this->_store->save($attributes, $object_id);
+diff -r 0a5153c325f0 turba/lib/Object.php
+--- a/turba/lib/Object.php	Fri Nov 14 08:35:22 2008 +0100
++++ b/turba/lib/Object.php	Fri Nov 14 08:50:29 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'];

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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- horde-webmail-1.2.0_kolab_openpkg.patch	14 Nov 2008 06:54:47 -0000	1.9
+++ horde-webmail-1.2.0_kolab_openpkg.patch	14 Nov 2008 07:50:57 -0000	1.10
@@ -1,6 +1,6 @@
-diff -r f832e54a827a config/conf.php
+diff -r 0a5153c325f0 config/conf.php
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/config/conf.php	Fri Nov 14 07:53:22 2008 +0100
++++ b/config/conf.php	Fri Nov 14 08:37:52 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');
[...1033 lines suppressed...]
-+++ b/turba/lib/Driver/share.php	Fri Nov 14 07:53:22 2008 +0100
+diff -r 0a5153c325f0 turba/lib/Driver/share.php
+--- a/turba/lib/Driver/share.php	Fri Nov 14 08:35:22 2008 +0100
++++ b/turba/lib/Driver/share.php	Fri Nov 14 08:37:52 2008 +0100
 @@ -145,7 +145,7 @@
      function _deleteAll($sourceName = null)
      {
@@ -12708,9 +12708,9 @@
          }
          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 14 07:53:22 2008 +0100
+diff -r 0a5153c325f0 turba/lib/Object.php
+--- a/turba/lib/Object.php	Fri Nov 14 08:35:22 2008 +0100
++++ b/turba/lib/Object.php	Fri Nov 14 08:37:52 2008 +0100
 @@ -249,7 +249,10 @@
       */
      function addFile($info)





More information about the commits mailing list