Changes of Revision 63

kolab-syncroton.spec Changed
x
 
1
@@ -43,7 +43,7 @@
2
 %global upstream_version 2.4.2
3
 
4
 Name:           kolab-syncroton
5
-Version: 2.4.2.35
6
+Version: 2.4.2.36
7
 Release:        1%{?dist}
8
 Summary:        ActiveSync for Kolab Groupware
9
 
10
debian.changelog Changed
7
 
1
@@ -1,4 +1,4 @@
2
-kolab-syncroton (2.4.2.35-0~kolab1) unstable; urgency=low
3
+kolab-syncroton (2.4.2.36-0~kolab1) unstable; urgency=low
4
 
5
   * Release version 2.4.2
6
 
7
kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/Ping.php Changed
23
 
1
@@ -68,6 +68,10 @@
2
                 $folders = ;
3
                 foreach ($xml->Folders->Folder as $folderXml) {
4
                     try {
5
+                        if (empty((string)$folderXml->Id)) {
6
+                            // Ignore empty folder ids
7
+                            continue;
8
+                        }
9
                         // does the folder exist?
10
                         $folder = $this->_folderBackend->getFolder($this->_device, (string)$folderXml->Id);
11
 
12
@@ -191,6 +195,10 @@
13
                 $now = new DateTime('now', new DateTimeZone('UTC'));
14
 
15
                 foreach ($folders as $folderId) {
16
+                    if (empty($folderId)) {
17
+                        // Ignore empty folder ids
18
+                        continue;
19
+                    }
20
                     try {
21
                         /** @var Syncroton_Model_Folder $folder */
22
                         $folder         = $this->_folderBackend->get($folderId);
23
kolab-syncroton.dsc Changed
10
 
1
@@ -2,7 +2,7 @@
2
 Source: kolab-syncroton
3
 Binary: kolab-syncroton
4
 Architecture: all
5
-Version: 1:2.4.2.35-1~kolab1
6
+Version: 1:2.4.2.36-1~kolab1
7
 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
8
 Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
9
 Homepage: http://www.kolab.org/
10