gunnar: server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215 t_framework_HK_GW_ZpushAnnotations.diff, 1.1, 1.2

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215
In directory doto:/tmp/cvs-serv17732/patches/Horde_Share-0.0.3dev20091215

Modified Files:
	t_framework_HK_GW_ZpushAnnotations.diff 
Log Message:
Allways return the activesync share settings.

Index: t_framework_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/pear/Horde_Share/patches/Horde_Share-0.0.3dev20091215/t_framework_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- t_framework_HK_GW_ZpushAnnotations.diff	6 May 2010 07:10:06 -0000	1.1
+++ t_framework_HK_GW_ZpushAnnotations.diff	10 May 2010 07:08:07 -0000	1.2
@@ -1,13 +1,13 @@
 diff -Naur a/a/a/Share/kolab.php b/a/a/Share/kolab.php
 --- a/a/a/Share/kolab.php	2010-05-05 07:51:03.742452620 +0200
 +++ b/a/a/Share/kolab.php	2010-05-06 07:46:45.088087728 +0200
-@@ -529,7 +529,8 @@
+@@ -524,7 +524,8 @@
+             $params = @unserialize($this->_folder->getAttribute('params'));
+             $default = array('source' => 'kolab',
+                              'default' => $this->get('default'),
+-                             'name' => $this->get('name'));
++                             'name' => $this->get('name'),
++                             'activesync'  => $this->_folder->getActiveSync());
+             $type = $this->get('type');
              if (!is_a($type, 'PEAR_Error') && $type == 'event') {
                  $default = array_merge($default, array(
-                                            'fbrelevance' => $this->_folder->getFbrelevance(),
--                                           'xfbaccess'   => $this->_folder->getXfbaccess()
-+                                           'xfbaccess'   => $this->_folder->getXfbaccess(),
-+                                           'activesync'  => $this->_folder->getActiveSync()
-                                        ));
-             }
-             if (is_a($params, 'PEAR_Error') || $params == '') {